Event registration - email field

loudislav · Jan 24, 2021 · 1542316 · 1542316
1 parent b4bb078
commit 1542316
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 7 deletions.
diff --git a/src/components/Event/CheckoutPersonCard.vue b/src/components/Event/CheckoutPersonCard.vue
@@ -76,6 +76,11 @@
           <dt>{{ $tr("fields.diet") }}:</dt>
           <dd>{{ dietaryRequirement }}</dd>
         </div>
+
+        <div v-if="person.person.email && person.person.email">
+          <dt>{{ $tr("auth.fields.email", null, false) }}:</dt>
+          <dd>{{ person.person.email }}</dd>
+        </div>
       </q-card-section>
 
       <q-separator v-if="person.registration.accommodation" inset />
@@ -89,16 +94,15 @@
             v-if="
               value &&
                 fieldName.substr(-4) !== 'name' &&
-                fieldName !== 'dietary_requirement'
+                fieldName !== 'dietary_requirement' &&
+                fieldName !== 'email'
             "
           >
             <dt>{{ $tr("fields." + fieldName) }}:</dt>
             <dd v-if="fieldName === 'birthdate'">
               {{ value | moment("D. M. Y") }}
             </dd>
-            <dd
-              v-else-if="value != null && fieldName !== 'dietary_requirement'"
-            >
+            <dd v-else-if="value != null">
               {{ value }}
             </dd>
           </template>

diff --git a/src/components/Event/FormFields.vue b/src/components/Event/FormFields.vue
@@ -28,6 +28,25 @@
       />
     </div>
 
+    <q-input
+      v-if="requireEmail"
+      v-model="values.email"
+      class="q-mt-sm"
+      type="email"
+      outlined
+      :label="$tr('auth.fields.email', null, false) + ' *'"
+      lazy-rules
+      :rules="[
+        val =>
+          (val !== null && val !== '') ||
+          $tr(`general.form.fieldError`, null, false)
+      ]"
+    >
+      <template v-slot:prepend>
+        <q-icon name="fas fa-at" />
+      </template>
+    </q-input>
+
     <div
       class="block"
       v-if="accommodationType !== 'required' && accommodationType !== 'none'"
@@ -471,7 +490,8 @@ export default {
     accommodationType: String,
     mealType: String,
     possibleDiets: Array,
-    role: Number
+    role: Number,
+    requireEmail: Boolean
   },
 
   data() {
@@ -494,6 +514,7 @@ export default {
         // parentPhone: "+420",
         // parentEmail: null,
         note: null,
+        email: null,
         accept: false,
         birthDay: null,
         birthMonth: null,
@@ -759,6 +780,7 @@ export default {
         name: this.values.name ? this.values.name.trim() : null,
         surname: this.values.surname ? this.values.surname.trim() : null,
         note: this.values.note,
+        email: this.values.email,
         meals: this.values.meals,
         dietary_requirement: this.values.dietary_requirement
           ? this.values.dietary_requirement.value

diff --git a/src/components/Event/TeamForm.vue b/src/components/Event/TeamForm.vue
@@ -59,6 +59,7 @@
       :possibleDiets="possibleDiets"
       :accommodationType="accommodationType"
       :mealType="mealType"
+      :requireEmail="requireEmail"
     />
     <g-d-p-r-checkbox v-model="accept" :error="acceptError" />
     <div class="text-center">
@@ -105,7 +106,8 @@ export default {
     accommodationType: String,
     mealType: String,
     possibleDiets: Array,
-    eventId: Number
+    eventId: Number,
+    requireEmail: Boolean
   },
   data() {
     return {

diff --git a/src/components/Event/TeamPersonCard.vue b/src/components/Event/TeamPersonCard.vue
@@ -46,6 +46,7 @@
             :mealType="mealType"
             :possibleDiets="possibleDiets"
             :role="1"
+            :requireEmail="requireEmail"
           />
         </q-card-section>
       </slide-up-down>
@@ -68,7 +69,8 @@ export default {
     error: Boolean,
     accommodationType: String,
     mealType: String,
-    possibleDiets: Array
+    possibleDiets: Array,
+    requireEmail: Boolean
   },
   data() {
     return {

diff --git a/src/pages/Event.vue b/src/pages/Event.vue
@@ -136,6 +136,7 @@
           :mealType="mealType"
           :possibleDiets="possibleDiets"
           :role="role"
+          :requireEmail="event.email_required"
           @goToRolePick="goTo('role')"
         />
         <team-form
@@ -148,6 +149,7 @@
           :mealType="mealType"
           :possibleDiets="possibleDiets"
           :eventId="event.id"
+          :requireEmail="event.email_required"
         ></team-form>
       </div>
     </div>