Add question if user has BE rijbewijs (#941)

* Intial commit

* added setup variable

* small fix

* refractor to trailer-drivers-license

* Fixed lint

* Check which files are changed

* small change

* hopefully this works

* git push

* fix

* remove unneaded changes

Author: lodewiges

app/components/cards/privacy-preference.hbs

@@ -49,5 +49,9 @@
       <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/privacy-modal.hbs

@@ -125,6 +125,29 @@
           </div>
         {{/each}}
       </div>
+    {{else if (eq this.step 7)}}
+      <b>Heb je een BE-rijbewijs?</b>
+      <br />
+      <small>
+        Binnen Alpha hebben we een keet om ervoor te zorgen dat 
+        het vervoer soepel verloopt, houdt de Keetcie een lijst bij 
+        van leden met een BE-rijbewijs.
+      </small>
+      <br />
+      <br />
+
+      <div
+        class='btn btn-primary'
+        {{on 'click' (fn this.select 'trailerDriversLicense' true)}}
+      >
+        Ja
+      </div>
+      <div
+        class='btn btn-danger'
+        {{on 'click' (fn this.select 'trailerDriversLicense' false)}}
+      >
+        Nee
+      </div>
     {{/if}}
 
     {{#if this.errorMessage}}

app/components/privacy-modal.js

@@ -17,7 +17,7 @@ export default class PrivacyModal extends Component {
 
   @tracked isOpen = false;
   @tracked step = 1;
-  maxSteps = 6;
+  maxSteps = 7;
   @tracked errorMessage = null;
   get userDetailsPreferenceTypes() {
     return Object.entries(UserDetailsPreferenceTypes).map(([value, label]) => ({
@@ -42,9 +42,16 @@ export default class PrivacyModal extends Component {
     }
   }
 
-  @action nextPage() {
+  @action async nextPage() {
     this.errorMessage = null;
     if (this.step >= this.maxSteps) {
+      this.model.set('setupComplete', true);
+      try {
+        await this.model.save();
+      } catch (error) {
+        this.errorMessage = error.errors.map((e) => e.detail).join(', ');
+        return;
+      }
       this.isOpen = false;
       return;
     }
@@ -61,82 +68,6 @@ export default class PrivacyModal extends Component {
 
   constructor() {
     super(...arguments);
-    if (
-      this.model?.userDetailsSharingPreference === null ||
-      this.model?.allowTomatoSharing === null
-    ) {
-      this.isOpen = true;
-    } else {
-      this.isOpen = false;
-    }
+    this.isOpen = !this.model?.setupComplete;
   }
 }
-//
-// export default Component.extend({
-//   session: service(),
-//   store: service(),
-//   fetch: service(),
-//   model: alias('session.currentUser'),
-//   isOpen: false,
-//   step: 1,
-//   maxSteps: 6,
-//   errorMessage: null,
-//   userDetailsPreferenceTypes: computed(function () {
-//     return Object.entries(UserDetailsPreferenceTypes).map(([value, label]) => ({
-//       value,
-//       label,
-//     }));
-//   }),
-//   picturePublicationPreferenceTypes: computed(function () {
-//     return Object.entries(PicturePublicationPreferenceTypes).map(
-//       ([value, label]) => ({ value, label })
-//     );
-//   }),
-//   actions: {
-//     select(attribute, value) {
-//       this.model.set(attribute, value);
-//       this.model
-//         .save()
-//         .then(() => {
-//           this.send('nextPage');
-//         })
-//         .catch((error) => {
-//           this.set(
-//             'errorMessage',
-//             error.errors
-//               .map((e) => {
-//                 return e.detail;
-//               })
-//               .join(', ')
-//           );
-//         });
-//     },
-//     nextPage() {
-//       this.set('errorMessage', null);
-//       if (this.step >= this.maxSteps) {
-//         this.set('isOpen', false);
-//       } else {
-//         this.set('step', this.step + 1);
-//       }
-//     },
-//     allowWebdav() {
-//       return this.fetch
-//         .fetch(`/users/${this.model.id}/activate_webdav`, { method: 'POST' })
-//         .then(() => {
-//           this.model.reload();
-//           this.send('nextPage');
-//         });
-//     },
-//   },
-//   init() {
-//     this._super(...arguments);
-//     if (
-//       this.model?.userDetailsSharingPreference === null ||
-//       this.model?.allowTomatoSharing === null
-//     ) {
-//       this.set('isOpen', true);
-//     } else {
-//       this.set('isOpen', false);
-//     }
-//   },
-// });

app/components/users/privacy-settings.hbs

@@ -87,6 +87,21 @@
     </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/models/user.js

@@ -36,9 +36,11 @@ export default class User extends Model {
   @attr picturePublicationPreference;
 
   @attr ifesDataSharingPreference;
-  @attr({ allowNull: true }) allowTomatoSharing;
+  @attr allowTomatoSharing;
   @attr infoInAlmanak;
   @attr userDetailsSharingPreference;
+  @attr trailerDriversLicense;
+  @attr setupComplete;
   // Security properties
   @attr otpRequired;
   @attr icalSecretKey;