make sidekiq UI modifiable & Be rijbewijs improvements (#956)

* intial commit

* make BE rijbewijs exportable

* improved implementation

* added setupcomplete to export variables

Author: lodewiges

app/components/cards/privacy-preference.hbs

@@ -49,9 +49,5 @@
       <td>Gegevens (naam, afbeelding, studie) mogen gedeeld worden in de almanak</td>
       <td data-test-info-in-almanak>{{boolean-tag @model.infoInAlmanak}}</td>
     </tr>
-    <tr>
-      <td>Bezit BE rijbewijs</td>
-      <td data-test-trailer-drivers-license>{{boolean-tag @model.trailerDriversLicense}}</td>
-    </tr>
   </tbody>
 </table>

app/components/forms/user-form.hbs

@@ -142,6 +142,13 @@
     @labelClass='col-sm-5'
     @inputWrapperClass='col-sm-7'
   />
+  <ModelForm::CheckboxInput
+    @model={{@model}}
+    @property='trailerDriversLicense'
+    @label='BE rijbewijs'
+    @labelClass='col-sm-5'
+    @inputWrapperClass='col-sm-7'
+  />
 
   <h5>Voorkeuren</h5>
   <ModelForm::SelectInput
@@ -172,6 +179,16 @@
     @labelColspan={{5}}
   />
 
+  <ModelForm::CheckboxInput
+    @model={{@model}}
+    @property='sidekiqAccess'
+    @labelClass='col-sm-5'
+    @inputWrapperClass='col-sm-7'
+    @label='Sidekiq toegang'
+    @disabled={{@canEditOnlyOwnProperties}}
+    @labelColspan={{5}}
+  />
+
   <ModelForm::FormActions
     @errors={{@model.errors}}
     @errorMessage={{@errorMessage}}

app/components/users/privacy-settings.hbs

@@ -87,21 +87,6 @@
     </div>
   </div>
 
-  <div class='mb-3 row align-items-center'>
-    <label class='col-10 col-sm-6 col-form-label form-label' for="trailer-drivers-license-check">
-      Bezit BE rijbewijs
-    </label>
-    <div class='col-2 col-sm-6'>
-      {{input
-        data-test-trailerDriversLicense=true
-        type='checkbox'
-        checked=@model.trailerDriversLicense
-        class='form-check-input'
-        id="trailer-drivers-license-check"
-      }}
-    </div>
-  </div>
-
   {{#if formActionsVisible}}
     <ModelForm::FormActions
       @errors={{@model.errors}}

app/controllers/groups/group/export.js

@@ -115,6 +115,14 @@ export default class GroupExportController extends Controller {
       value: 'emergency_number',
       label: 'Noodnummer',
     },
+    {
+      value: 'trailerDriversLicense',
+      label: 'BE rijbewijs',
+    },
+    {
+      value: 'setupComplete',
+      label: 'Setup voltooid',
+    },
   ];
 
   @computed('questions.@each.answer')

app/models/user.js

@@ -26,21 +26,22 @@ export default class User extends Model {
   // Preferences / settings
   @attr foodPreferences;
   @attr vegetarian;
+  @attr trailerDriversLicense;
   @attr('date-only') startStudy;
+
+  // Restricted Settings
   @attr emergencyContact;
   @attr emergencyNumber;
   @attr almanakSubscriptionPreference;
   @attr digtusSubscriptionPreference;
 
   // Privacy settings
   @attr picturePublicationPreference;
-
   @attr ifesDataSharingPreference;
   @attr allowTomatoSharing;
   @attr infoInAlmanak;
   @attr userDetailsSharingPreference;
-  @attr trailerDriversLicense;
-  @attr setupComplete;
+
   // Security properties
   @attr otpRequired;
   @attr icalSecretKey;
@@ -51,6 +52,8 @@ export default class User extends Model {
   @attr('date') activatedAt;
   @attr('date') createdAt;
   @attr('date') updatedAt;
+  @attr sidekiqAccess;
+  @attr setupComplete;
 
   // Avatar
   @attr avatar;

app/templates/users/user/index.hbs

@@ -81,6 +81,10 @@
                 }}
               </td>
             </tr>
+            <tr>
+              <td>Bezit BE rijbewijs</td>
+              <td data-test-trailer-drivers-license>{{boolean-tag @model.trailerDriversLicense}}</td>
+            </tr>
           </tbody>
         </table>
       </p>

app/templates/users/user/settings.hbs

@@ -84,6 +84,10 @@
         <td>Two-Factor geactiveerd</td>
         <td data-test-otpRequired>{{boolean-tag @model.otpRequired}}</td>
       </tr>
+      <tr>
+        <td>Sidekiq toegang</td>
+        <td data-test-sidekiqAccess>{{boolean-tag @model.sidekiqAccess}}</td>
+      </tr>
     </tbody>
   </table>
 </TabbedView>