Sprint end pull request by Dansuf · Pull Request #40 · RUGSoftEng/2018-Evidencio

Dansuf · 2018-05-31T21:43:45Z

Improved the designer and added missing options; implemented saving of workflows; connected patient side to the database; improved charts; improved PDF output; implemented "my workflows" page; improved registration and authorisation.

Period (17.04-06.05)

Added title/description for workflow and for steps, made it possible to remove steps (added confirmatiion dialog for that, just to be sure), made first start to adding rules (including lines between steps, though I'm not yet finished with that). Lots of other tiny changes (mostly layout).

Needs some fixing..

When a chart type is changed for a certain result step, it is changed for every result step to be of same type.

-Rule removal when adding level between, rule removal when removing node. Rules not yet added to the database. -Start to getting result structure of API-call. Retrieve accessible fields from current location (useful for API-call mapping) -Fixed bug caused by removing steps

-Rule removal when adding level between, rule removal when removing node. Rules not yet added to the database. -Start to getting result structure of API-call (useful for result representation and rules) . Retrieve accessible fields from current location (useful for API-call mapping) -Fixed bug caused by removing steps

workflow page loads level 0 step and will run the Evidencio model associated with that Step. Created a search modal for designer-end

Haven't really tested it a lot, might be buggy. Was a pain to implement due to the A part of AJAX calls. Things to fix: - Update title/colour of rule targets each modal change

change graph from post to get

Update graph.blade.php

…nto timetracking

Update WorkflowStep.vue

rough update, forgot most hour, there are more, but its late.

Timetracking

Daanra · 2018-06-24T10:55:03Z

app/Http/Controllers/Auth/RegisterController.php

+            'email_token' => bin2hex(openssl_random_pseudo_bytes(16)),
        ]);
+
+        if(array_key_exists('file',$data))


indentation

Daanra · 2018-06-24T11:03:15Z

app/Http/Controllers/DesignerController.php

     *
-     * @param Number $workflowId
-     * @return Array
+     * @param HTTP|Request $request Post request containing a Evidencio Model Search


Simply request

Daanra · 2018-06-24T11:03:33Z

app/Http/Controllers/DesignerController.php

-     * @param Number $workflowId
-     * @return Array
+     * @param HTTP|Request $request Post request containing a Evidencio Model Search
+     * @return JSON Evidencio models


This is a string

Daanra · 2018-06-24T11:05:25Z

app/Http/Controllers/DesignerSaveController.php

+     * Should the workflowId be given, that workflow will be updated.
+     *
+     * @param HTTP|Request $request Post request withWorkflow data (title/description, steps, etc.)
+     * @param Number $workflowId


Sorry, confusion due to Javascript

Daanra · 2018-06-24T11:08:47Z

app/Http/Controllers/MyWorkflowsController.php

+        return view('myworkflows', compact('workflows'));
+    }
+
+    public function deleteWorkflow($id)


Missing PHP doc

What is missing?

Something like:

/** * Deletes a Workflow * @param int $id The id of the Workflow * @return void */

It is also missing type hints.

Daanra · 2018-06-24T11:32:47Z

resources/assets/js/components/DocumentInput.vue

+
+                if($(".add-document").is(":hidden") && appRegistration.fileList.length < appRegistration.maxFileNum)
+                {
+                    $(".add-document").show();


This is not really a 'Vue' way of doing it. Use v-show instead

Daanra · 2018-06-24T11:34:49Z

resources/assets/js/components/ModelLoad.vue

+    loadModelEvidencio() {
+      var self = this;
+
+      $.ajax({


You might want to use axios for better ajax requests. You can also add the CSRF token by default, so that you do not have to add it manually all the time.

Axios is nice indeed, works well with Vue. I am still starting with it though (yesterday, actually), so I still haven't quite figured out how it deals with multiple AJAX requests with one final callback.

Daanra · 2018-06-24T11:39:17Z

resources/views/emails/email_verification.blade.php

+
+@section('content')
+
+{{ _("Dear")}} {{$user->first_name}},<br>


This should be one call to _. Some languages will start with the name instead of 'Dear'.

Daanra · 2018-06-24T11:40:29Z

resources/views/graph.blade.php

-        <th width="5%"></th>
-        <th width="5%"></th>
-        <th width="5%"></th>
+        <th width="4%"></th>


You might want to make this dynamic

Daanra · 2018-06-24T11:42:04Z

routes/web.php

+Route::get('/usersverification', 'UsersVerificationController@index')->name('usersverification.index');
+
+Route::get('/usersverification/download/{id}', 'UsersVerificationController@download')->name('usersverification.download');
+Route::post('/usersverification/accept', 'UsersVerificationController@accept')->name('usersverification.accept');


It's best if you split the route file up in multiple files such that each file belongs to a single entity.

Will now see if I can move functions from controllers to models

Has to be tested thouroughly, so I would appreciate the help

Rest team final PR fixes

To do: Fontawesome

Hope I found all the icons used

Designer pr fixes

javier-png and others added 30 commits April 28, 2018 15:19

updated time tracking

d53cec9

update

4489154

Updated own timetracking.

ee77d42

Timetracking updated

0982519

Period (17.04-06.05)

Added timetracking for previous period

75d27ce

Merge remote-tracking branch 'origin/timetracking' into timetracking

29b672b

Updated timetracking

38b7fb6

updated timetracking

6cfb46f

updated timetracking

b3fbc91

Tiny layout fix

b62c1e4

Removing user's name column and little fixes to previous migrations

f083329

Fixing database tests according to last changes

3736473

Added all registration form fields apart from language and photo

d1939f8

Making nullable values in the registration form actually nullable

a970bc7

Added multiple charts, depending on the card chosen, they change

f0ca375

Needs some fixing..

Previous bug fixed, issue that all result nodes receive the same chart

16aefa5

When a chart type is changed for a certain result step, it is changed for every result step to be of same type.

Initial version of the users verification page

7e8f783

Fixed the bug, the designer pick chart type works good now

3b1cbca

Updated timetracking

4e2352a

Merge remote-tracking branch 'origin/timetracking' into timetracking

decfc66

Timetracking updated

d8d2c7a

update for workflow and modelLoad

6acfd48

workflow page loads level 0 step and will run the Evidencio model associated with that Step. Created a search modal for designer-end

Merge branch 'Patient_User' into designer

d0ceaa8

Saving and loading of rules/API-mapping

3c22bd6

Haven't really tested it a lot, might be buggy. Was a pain to implement due to the A part of AJAX calls. Things to fix: - Update title/colour of rule targets each modal change

Fixed some errors

b024d71

Changes that hopefully fix the wrong merge I did

32dc592

Tiny changes

dd34b85

Dammes closed this Jun 12, 2018

Dansuf added 3 commits June 13, 2018 00:25

Merge branch 'designer' into development

1d3cb25

Merge pull request #48 from RUGSoftEng/Dammes-patch-1

97917f1

change graph from post to get

Merge pull request #49 from RUGSoftEng/Dammes-patch-2

3292db7

Update graph.blade.php

Dansuf reopened this Jun 12, 2018

Dansuf and others added 9 commits June 13, 2018 00:41

Updated timetracking

26a1646

Merge branch 'timetracking' of github.com:RUGSoftEng/2018-Evidencio i…

3c259dd

…nto timetracking

Merge branch 'development' into timetracking

f017d01

Update WorkflowStep.vue

7ba8708

Merge pull request #52 from RUGSoftEng/Dammes-patch-3

9e543d1

Update WorkflowStep.vue

update

db61ab5

rough update, forgot most hour, there are more, but its late.

Updated timetracking

2df91cc

update

4bd4b88

Merge pull request #51 from RUGSoftEng/timetracking

297bdc6

Timetracking

FrankTN assigned Daanra Jun 23, 2018

Daanra reviewed Jun 24, 2018

View reviewed changes

jsvdvis and others added 14 commits June 24, 2018 18:21

Fixed comments

7558e41

Will now see if I can move functions from controllers to models

Small fixes mostly to rest-team-related code.

fa1afcc

Moved Controller-methods to appropiate models

b7a12e7

Has to be tested thouroughly, so I would appreciate the help

Divided routes into several separate files.

2ff0a48

Removed rule engine test

bfaaa1b

Fixes to the final PR in "My Workflows"

ea77503

Added missing "My Workflows" doc.

fd8ebc7

Merge pull request #53 from RUGSoftEng/rest-pr-fixes

c368a60

Rest team final PR fixes

Fixed but in controller + Aleksandar's changes

df6783d

To do: Fontawesome

Replaced Fontello with Fontawesome, fixed bugs

eca1202

Hope I found all the icons used

Added typehinting (hopefully correctly)

cd67285

Small mistake in typehinting

c905739

Merge branch 'development' into designer-pr-fixes

f8fc1b4

Merge pull request #54 from RUGSoftEng/designer-pr-fixes

c15f14f

Designer pr fixes


		@section('content')

		{{ _("Dear")}} {{$user->first_name}},<br>

Conversation

Dansuf commented May 31, 2018

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Daanra Jun 27, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

Daanra Jun 27, 2018 •

edited

Loading