@everymatrix/general-player-register-form-step2 0.0.233 → 0.0.237

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@everymatrix/general-player-register-form-step2",
-  "version": "0.0.233",
+  "version": "0.0.237",
   "main": "dist/general-player-register-form-step2.js",
   "svelte": "src/index.ts",
   "scripts": {
@@ -36,5 +36,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "d7554673f55c9c428a1cf82bdecf5f2da81e373d"
+  "gitHead": "2e75c5dd54e711bed0fc8b8282d8aa284725cfcf"
 }

package/src/GeneralPlayerRegisterFormStep2.svelte

@@ -14,22 +14,21 @@
   let invalidLastName:boolean = false;
   let invalidBirthPlace:boolean = false;
 
-  let userTitles:Array<Object> = ['Mr.', 'Mrs.', 'Ms.'];
-  let userTitleSelected:string = userTitles[0];
+  let userTitleSelected:string;
   let userFirstName:string = '';
   let userLastName:string = '';
   let birthDays:Array<Object> = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31];
-  let birthDaySelected:number = birthDays[0];
+  let birthDaySelected:number;
   let birthMonths:Array<Object> = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12];
-  let birthMonthSelected:number = birthMonths[0];
+  let birthMonthSelected:number;
   let birthYears:Array<Object> = [];
   let birthYearSelected:number;
   let birthPlace:string = '';
   let currencies:Array<Object> = [];
   let currencySelected:string = '';
   let currentDate:Date = new Date();
-  let minDate:string;
-  let maxDate:string;
+  let minDate:number;
+  let maxDate:number;
 
   let isValid:Boolean = false;
 
@@ -40,10 +39,8 @@
   });
 
   const createYearsArray = () => {
-    maxDate = moment(currentDate.setDate(currentDate.getDate())).subtract(parseInt(licenseyears), 'y').format('YYYY');
-    minDate = moment(currentDate.setDate(currentDate.getDate())).subtract(100 + parseInt(licenseyears), 'y').format('YYYY');
-
-    birthYearSelected = parseInt(maxDate);
+    maxDate = parseInt(moment(currentDate.setDate(currentDate.getDate())).subtract(parseInt(licenseyears), 'y').format('YYYY'));
+    minDate = parseInt(moment(currentDate.setDate(currentDate.getDate())).subtract(100 + parseInt(licenseyears), 'y').format('YYYY'));
 
     for(let i=maxDate; i>=minDate; i--) {
       birthYears.push(i);
@@ -63,7 +60,7 @@
 
   const checkIsValid = () => {
     isValid =  !(invalidFirstName || invalidLastName || invalidBirthPlace);
-    if (userFirstName.length <= 0 || userLastName.length <= 0 || birthPlace.length <= 0) {
+    if (userFirstName.length <= 0 || userLastName.length <= 0 || birthPlace.length <= 0 || !userTitleSelected || !birthDaySelected || !birthMonthSelected || !birthYearSelected) {
       isValid = false;
     }
   }
@@ -114,10 +111,10 @@
       birthPlace,
       currencySelected
     }
+
     window.postMessage({ type: 'RegisterStepTwo', registerStepTwoData }, window.location.href);
   }
 
-
   const goBack = () => {
     let registerStepTwoData = {
       userTitleSelected,
@@ -181,10 +178,11 @@
 <div class="RegisterFormContent">
   <div class="UserTitleContainer">
     <label for="Title">{$_('registerFormStep2.registerUserTitle')}:<span class="FormRequired">*</span></label>
-    <select bind:value={userTitleSelected} id="Title">
-      {#each userTitles as userTitle}
-        <option value="{userTitle}">{userTitle}</option>
-      {/each}}
+    <select bind:value={userTitleSelected} on:blur={checkIsValid} id="Title">
+      <option value="" disabled selected>{$_('registerFormStep2.registerUserTitleSelect')}</option>
+      <option value="Mr.">{$_('registerFormStep2.registerUserTitleSelectMr')}</option>
+      <option value="Mrs.">{$_('registerFormStep2.registerUserTitleSelectMrs')}</option>
+      <option value="Ms.">{$_('registerFormStep2.registerUserTitleSelectMs')}</option>
     </select>
   </div>
   <div class="FirstNameContainer {invalidFirstName ? 'InvalidField' : ''}">
@@ -204,17 +202,20 @@
   <div class="BirthDateContainer">
     <label for="BirthDate">{$_('registerFormStep2.registerDateOfBirth')}:<span class="FormRequired">*</span></label>
     <div class="BirthDateOptions">
-      <select bind:value={birthDaySelected} class="BirthDaySelected">
+      <select bind:value={birthDaySelected} on:blur={checkIsValid} class="BirthDaySelected">
+        <option value="" disabled selected>{$_('registerFormStep2.registerBirthDay')}</option>
         {#each birthDays as birthDay}
           <option value={birthDay}>{birthDay}</option>
         {/each}
       </select>
-      <select bind:value={birthMonthSelected} class="BirthMonthSelected">
+      <select bind:value={birthMonthSelected} on:blur={checkIsValid} class="BirthMonthSelected">
+        <option value="" disabled selected>{$_('registerFormStep2.registerBirthMonth')}</option>
         {#each birthMonths as birthMonth}
           <option value={birthMonth}>{birthMonth}</option>
         {/each}
       </select>
-      <select bind:value={birthYearSelected} class="BirthYearSelected">
+      <select bind:value={birthYearSelected} on:blur={checkIsValid} class="BirthYearSelected">
+        <option value="" disabled selected>{$_('registerFormStep2.registerBirthYear')}</option>
         {#each birthYears as birthYear}
           <option value={birthYear}>{birthYear}</option>
         {/each}

package/src/translations.js

@@ -3,11 +3,18 @@ export const RegisterFormStep2Translations = {
     registerFormStep2: {
       registerBackButton: 'Back',
       registerUserTitle: 'Title',
+      registerUserTitleSelect: 'Select Title',
+      registerUserTitleSelectMr: 'Mr.',
+      registerUserTitleSelectMrs: 'Mrs.',
+      registerUserTitleSelectMs: 'Ms.',
       registerFirstName: 'First Name',
       registerFirstNameError: 'First name must be at least 2 characters long and contain no special characters.',
       registerLastName: 'Last Name',
       registerLastNameError: 'Last name must be at least 2 characters long and contain no special characters.',
       registerDateOfBirth: 'Date of Birth',
+      registerBirthDay: 'Day',
+      registerBirthMonth: 'Month',
+      registerBirthYear: 'Year',
       registerBirthPlace: 'Birth Place',
       registerBirthPlaceError: 'Birth place must be at least 1 character long.',
       registerCurrency: 'Currency',
@@ -18,11 +25,18 @@ export const RegisterFormStep2Translations = {
     registerFormStep2: {
       registerBackButton: 'Geri',
       registerUserTitle: 'Başlık',
+      registerUserTitleSelect: 'Başlık Seç',
+      registerUserTitleSelectMr: 'Bay.',
+      registerUserTitleSelectMrs: 'Bayan.',
+      registerUserTitleSelectMs: 'Hanım.',
       registerFirstName: 'İlk adı',
       registerFirstNameError: 'Ad en az 2 karakter uzunluğunda olmalı ve özel karakter içermemelidir.',
       registerLastName: 'Soyadı',
       registerLastNameError: 'Soyadı en az 2 karakter uzunluğunda olmalı ve özel karakter içermemelidir.',
       registerDateOfBirth: 'Doğum tarihi',
+      registerBirthDay: 'Gün',
+      registerBirthMonth: 'Ay',
+      registerBirthYear: 'Yıl',
       registerBirthPlace: 'Doğum yeri',
       registerBirthPlaceError: 'Doğum yeri en az 1 karakter uzunluğunda olmalıdır.',
       registerCurrency: 'Para birimi',
@@ -33,11 +47,18 @@ export const RegisterFormStep2Translations = {
     registerFormStep2: {
       registerBackButton: 'Inapoi',
       registerUserTitle: 'Titlu',
+      registerUserTitleSelect: 'Selecteaza Titlu',
+      registerUserTitleSelectMr: 'Dl.',
+      registerUserTitleSelectMrs: 'Dna.',
+      registerUserTitleSelectMs: 'Dra.',
       registerFirstName: 'Prenume',
       registerFirstNameError: 'Prenumele trebuie sa fie de minim 2 litere si sa nu contina caractere speciale.',
       registerLastName: 'Nume',
       registerLastNameError: 'Numele trebuie sa fie de minim 2 litere si sa nu contina caractere speciale',
       registerDateOfBirth: 'Data Nasterii',
+      registerBirthDay: 'Zi',
+      registerBirthMonth: 'Luna',
+      registerBirthYear: 'An',
       registerBirthPlace: 'Locule nasterii',
       registerBirthPlaceError: 'Locul nasterii trebuie sa contina minim o litera',
       registerCurrency: 'Moneda',