fix: Remove date and time validations (#3672)

kushthedude · iamareebjamal · commit 45018cf3a164 · 2019-11-30T14:09:41.000+05:30
diff --git a/app/components/forms/events/view/create-discount-code.js b/app/components/forms/events/view/create-discount-code.js
@@ -3,7 +3,6 @@ import { computed } from '@ember/object';
 import FormMixin from 'open-event-frontend/mixins/form';
 import { later } from '@ember/runloop';
 import { currencySymbol } from 'open-event-frontend/helpers/currency-symbol';
-import moment from 'moment';
 export default Component.extend(FormMixin, {
   getValidationRules() {
     window.$.fn.form.settings.rules.checkMaxMin = () => {
@@ -22,11 +21,7 @@ export default Component.extend(FormMixin, {
       return false;
     };
 
-    window.$.fn.form.settings.rules.checkDates = () => {
-      let startDatetime = moment(this.get('data.validFrom'));
-      let endDatetime = moment(this.get('data.validTill'));
-      return (endDatetime.diff(startDatetime, 'minutes') > 0);
-    };
+    // TODO: Removing the Discount Code Time Validations due to the weird and buggy behaviour. Will be restored once a perfect solution is found. Please check issue: https://github.com/fossasia/open-event-frontend/issues/3667
     return {
       inline : true,
       delay  : false,
@@ -113,46 +108,6 @@ export default Component.extend(FormMixin, {
               prompt : this.l10n.t('Please select atleast 1 ticket.')
             }
           ]
-        },
-        startDate: {
-          optional   : true,
-          identifier : 'start_date',
-          rules      : [
-            {
-              type   : 'checkDates',
-              prompt : this.l10n.t('Valid Till date & time should be after valid from date and time')
-            }
-          ]
-        },
-        startTime: {
-          optional   : true,
-          identifier : 'start_time',
-          rules      : [
-            {
-              type   : 'checkDates',
-              prompt : '.'
-            }
-          ]
-        },
-        endDate: {
-          optional   : true,
-          identifier : 'end_date',
-          rules      : [
-            {
-              type   : 'checkDates',
-              prompt : this.l10n.t('Valid Till date & time should be after valid from date and time')
-            }
-          ]
-        },
-        endTime: {
-          optional   : true,
-          identifier : 'end_time',
-          rules      : [
-            {
-              type   : 'checkDates',
-              prompt : '.'
-            }
-          ]
         }
       }
     };
diff --git a/app/components/forms/wizard/basic-details-step.js b/app/components/forms/wizard/basic-details-step.js
@@ -125,12 +125,8 @@ export default Component.extend(FormMixin, EventWizardMixin, {
     }
   },
 
+  // TODO: Removing the Event Time Validations due to the weird and buggy behaviour. Will be restored once a perfect solution is found. Please check issue: https://github.com/fossasia/open-event-frontend/issues/3667
   getValidationRules() {
-    window.$.fn.form.settings.rules.checkDates = () => {
-      let startDatetime = moment(this.get('data.event.startsAt'));
-      let endDatetime = moment(this.get('data.event.endsAt'));
-      return (endDatetime.diff(startDatetime, 'minutes') > 0);
-    };
 
     let validationRules = {
       inline : true,
@@ -165,10 +161,6 @@ export default Component.extend(FormMixin, EventWizardMixin, {
             {
               type   : 'date',
               prompt : this.l10n.t('Please give a valid start date')
-            },
-            {
-              type   : 'checkDates',
-              prompt : this.l10n.t('Start date & time should be before End date and time')
             }
           ]
         },
@@ -182,10 +174,6 @@ export default Component.extend(FormMixin, EventWizardMixin, {
             {
               type   : 'date',
               prompt : this.l10n.t('Please give a valid end date')
-            },
-            {
-              type   : 'checkDates',
-              prompt : this.l10n.t('Start date & time should be before End date and time')
             }
           ]
         },
@@ -196,10 +184,6 @@ export default Component.extend(FormMixin, EventWizardMixin, {
             {
               type   : 'empty',
               prompt : this.l10n.t('Please give a start time')
-            },
-            {
-              type   : 'checkDates',
-              prompt : '..'
             }
           ]
         },
@@ -210,10 +194,6 @@ export default Component.extend(FormMixin, EventWizardMixin, {
             {
               type   : 'empty',
               prompt : this.l10n.t('Please give an end time')
-            },
-            {
-              type   : 'checkDates',
-              prompt : '..'
             }
           ]
         },
diff --git a/app/components/forms/wizard/sessions-speakers-step.js b/app/components/forms/wizard/sessions-speakers-step.js
@@ -3,16 +3,11 @@ import { computed } from '@ember/object';
 import FormMixin from 'open-event-frontend/mixins/form';
 import EventWizardMixin from 'open-event-frontend/mixins/event-wizard';
 import { groupBy } from 'lodash-es';
-import moment from 'moment';
 
 export default Component.extend(EventWizardMixin, FormMixin, {
 
+  // TODO: Removing the Session & Speaker Time Validations due to the weird and buggy behaviour. Will be restored once a perfect solution is found. Please check issue: https://github.com/fossasia/open-event-frontend/issues/3667
   getValidationRules() {
-    window.$.fn.form.settings.rules.checkDates = () => {
-      let startDatetime = moment(this.get('data.speakersCall.startsAt'));
-      let endDatetime = moment(this.get('data.speakersCall.endsAt'));
-      return (endDatetime.diff(startDatetime, 'minutes') > 0);
-    };
     return {
       inline : true,
       delay  : false,
@@ -60,10 +55,6 @@ export default Component.extend(EventWizardMixin, FormMixin, {
             {
               type   : 'empty',
               prompt : this.l10n.t('Please tell us when your event starts')
-            },
-            {
-              type   : 'checkDates',
-              prompt : this.l10n.t('Start date & time ')
             }
           ]
         },
@@ -73,10 +64,6 @@ export default Component.extend(EventWizardMixin, FormMixin, {
             {
               type   : 'empty',
               prompt : this.l10n.t('Please tell us when your event ends')
-            },
-            {
-              type   : 'checkDates',
-              prompt : this.l10n.t('Start date & time should be after End date and time')
             }
           ]
         },
@@ -87,10 +74,6 @@ export default Component.extend(EventWizardMixin, FormMixin, {
             {
               type   : 'empty',
               prompt : this.l10n.t('Please give a start time')
-            },
-            {
-              type   : 'checkDates',
-              prompt : '.'
             }
           ]
         },
@@ -101,10 +84,6 @@ export default Component.extend(EventWizardMixin, FormMixin, {
             {
               type   : 'empty',
               prompt : this.l10n.t('Please give an end time')
-            },
-            {
-              type   : 'checkDates',
-              prompt : '.'
             }
           ]
         }

Original file line number	Diff line number	Diff line change
`@@ -125,12 +125,8 @@ export default Component.extend(FormMixin, EventWizardMixin, {`
`125`	`125`	`}`
`126`	`126`	`},`
`127`	`127`
	`128`	`+ // TODO: Removing the Event Time Validations due to the weird and buggy behaviour. Will be restored once a perfect solution is found. Please check issue: https://github.com/fossasia/open-event-frontend/issues/3667`
`128`	`129`	`getValidationRules() {`
`129`		`- window.$.fn.form.settings.rules.checkDates = () => {`
`130`		`- let startDatetime = moment(this.get('data.event.startsAt'));`
`131`		`- let endDatetime = moment(this.get('data.event.endsAt'));`
`132`		`- return (endDatetime.diff(startDatetime, 'minutes') > 0);`
`133`		`- };`
`134`	`130`
`135`	`131`	`let validationRules = {`
`136`	`132`	`inline : true,`
`@@ -165,10 +161,6 @@ export default Component.extend(FormMixin, EventWizardMixin, {`
`165`	`161`	`{`
`166`	`162`	`type : 'date',`
`167`	`163`	`prompt : this.l10n.t('Please give a valid start date')`
`168`		`- },`
`169`		`- {`
`170`		`- type : 'checkDates',`
`171`		`- prompt : this.l10n.t('Start date & time should be before End date and time')`
`172`	`164`	`}`
`173`	`165`	`]`
`174`	`166`	`},`
`@@ -182,10 +174,6 @@ export default Component.extend(FormMixin, EventWizardMixin, {`
`182`	`174`	`{`
`183`	`175`	`type : 'date',`
`184`	`176`	`prompt : this.l10n.t('Please give a valid end date')`
`185`		`- },`
`186`		`- {`
`187`		`- type : 'checkDates',`
`188`		`- prompt : this.l10n.t('Start date & time should be before End date and time')`
`189`	`177`	`}`
`190`	`178`	`]`
`191`	`179`	`},`
`@@ -196,10 +184,6 @@ export default Component.extend(FormMixin, EventWizardMixin, {`
`196`	`184`	`{`
`197`	`185`	`type : 'empty',`
`198`	`186`	`prompt : this.l10n.t('Please give a start time')`
`199`		`- },`
`200`		`- {`
`201`		`- type : 'checkDates',`
`202`		`- prompt : '..'`
`203`	`187`	`}`
`204`	`188`	`]`
`205`	`189`	`},`
`@@ -210,10 +194,6 @@ export default Component.extend(FormMixin, EventWizardMixin, {`
`210`	`194`	`{`
`211`	`195`	`type : 'empty',`
`212`	`196`	`prompt : this.l10n.t('Please give an end time')`
`213`		`- },`
`214`		`- {`
`215`		`- type : 'checkDates',`
`216`		`- prompt : '..'`
`217`	`197`	`}`
`218`	`198`	`]`
`219`	`199`	`},`
Original file line number	Diff line number	Diff line change
`@@ -3,16 +3,11 @@ import { computed } from '@ember/object';`
`3`	`3`	`import FormMixin from 'open-event-frontend/mixins/form';`
`4`	`4`	`import EventWizardMixin from 'open-event-frontend/mixins/event-wizard';`
`5`	`5`	`import { groupBy } from 'lodash-es';`
`6`		`-import moment from 'moment';`
`7`	`6`
`8`	`7`	`export default Component.extend(EventWizardMixin, FormMixin, {`
`9`	`8`
	`9`	`+ // TODO: Removing the Session & Speaker Time Validations due to the weird and buggy behaviour. Will be restored once a perfect solution is found. Please check issue: https://github.com/fossasia/open-event-frontend/issues/3667`
`10`	`10`	`getValidationRules() {`
`11`		`- window.$.fn.form.settings.rules.checkDates = () => {`
`12`		`- let startDatetime = moment(this.get('data.speakersCall.startsAt'));`
`13`		`- let endDatetime = moment(this.get('data.speakersCall.endsAt'));`
`14`		`- return (endDatetime.diff(startDatetime, 'minutes') > 0);`
`15`		`- };`
`16`	`11`	`return {`
`17`	`12`	`inline : true,`
`18`	`13`	`delay : false,`
`@@ -60,10 +55,6 @@ export default Component.extend(EventWizardMixin, FormMixin, {`
`60`	`55`	`{`
`61`	`56`	`type : 'empty',`
`62`	`57`	`prompt : this.l10n.t('Please tell us when your event starts')`
`63`		`- },`
`64`		`- {`
`65`		`- type : 'checkDates',`
`66`		`- prompt : this.l10n.t('Start date & time ')`
`67`	`58`	`}`
`68`	`59`	`]`
`69`	`60`	`},`
`@@ -73,10 +64,6 @@ export default Component.extend(EventWizardMixin, FormMixin, {`
`73`	`64`	`{`
`74`	`65`	`type : 'empty',`
`75`	`66`	`prompt : this.l10n.t('Please tell us when your event ends')`
`76`		`- },`
`77`		`- {`
`78`		`- type : 'checkDates',`
`79`		`- prompt : this.l10n.t('Start date & time should be after End date and time')`
`80`	`67`	`}`
`81`	`68`	`]`
`82`	`69`	`},`
`@@ -87,10 +74,6 @@ export default Component.extend(EventWizardMixin, FormMixin, {`
`87`	`74`	`{`
`88`	`75`	`type : 'empty',`
`89`	`76`	`prompt : this.l10n.t('Please give a start time')`
`90`		`- },`
`91`		`- {`
`92`		`- type : 'checkDates',`
`93`		`- prompt : '.'`
`94`	`77`	`}`
`95`	`78`	`]`
`96`	`79`	`},`
`@@ -101,10 +84,6 @@ export default Component.extend(EventWizardMixin, FormMixin, {`
`101`	`84`	`{`
`102`	`85`	`type : 'empty',`
`103`	`86`	`prompt : this.l10n.t('Please give an end time')`
`104`		`- },`
`105`		`- {`
`106`		`- type : 'checkDates',`
`107`		`- prompt : '.'`
`108`	`87`	`}`
`109`	`88`	`]`
`110`	`89`	`}`