Revert "Fix Graduation date question and saving questions validation (#…

…842)" This reverts commit 0db31d8.
CruGlobal · Sep 8, 2023 · 32dea52 · 32dea52
1 parent 0db31d8
commit 32dea52
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 19 deletions.
diff --git a/app/scripts/controllers/registration.js b/app/scripts/controllers/registration.js
@@ -367,16 +367,6 @@ angular
         var currentRegistrant = _.find($scope.currentRegistration.registrants, {
           id: $scope.currentRegistrant,
         });
-        const invalidBlocks = _.find(currentRegistration.registrants, {
-          id: currentRegistrant.id,
-        })
-          ? validateRegistrant.validate(
-              conference,
-              _.find(currentRegistration.registrants, {
-                id: currentRegistrant.id,
-              }),
-            )
-          : [];
         var answersToSave = [];
 
         angular.forEach(
@@ -386,9 +376,8 @@ angular
               id: a.id,
             });
             if (
-              (angular.isUndefined(savedAnswer) ||
-                !angular.equals(savedAnswer.value, a.value)) &&
-              !invalidBlocks.includes(a.blockId)
+              angular.isUndefined(savedAnswer) ||
+              !angular.equals(savedAnswer.value, a.value)
             ) {
               if ($scope.registerMode !== 'preview') {
                 answersToSave.push($http.put('answers/' + a.id, a));

diff --git a/app/scripts/directives/datepicker.js b/app/scripts/directives/datepicker.js
@@ -14,9 +14,9 @@ angular
       },
       controller: function ($timeout, $scope) {
         $scope.updateTimeStamp = function (timestamp) {
-          //For the Graduation date question, set the day to 10. The API needs the day but that could change in the future.
+          //For Graduation date question, set the day to 1. The API needs the day but that could change in the future.
           timestamp = $scope.monthYearOnly
-            ? moment(new Date(timestamp)).set('date', 10)
+            ? moment(new Date(timestamp)).set('date', 1)
             : timestamp;
           $scope.$apply(function () {
             let dateSaveFormat = $scope.monthYearOnly
@@ -30,13 +30,12 @@ angular
       },
       link: function (scope, element) {
         var datePickerElement = angular.element(element).find('.datepicker');
-        scope.localModel =
+        var initialDate =
           scope.localModel && scope.monthYearOnly
-            ? moment(new Date(scope.localModel)).format('YYYY-MM-DD')
+            ? scope.localModel
             : scope.localModel
             ? moment(new Date(scope.localModel)).format('MM/DD/YYYY hh:mm A')
             : null;
-        let initialDate = scope.localModel || null;
         scope.dateOptions = scope.monthYearOnly
           ? {
               viewMode: 'years',

diff --git a/test/spec/directives/datepicker.spec.js b/test/spec/directives/datepicker.spec.js
@@ -21,7 +21,7 @@ describe('Directive: datepicker', function () {
   it('Sets the date to the correct format based on the type of date question', function () {
     scope.updateTimeStamp(new Date('02/05/1994'));
 
-    expect(scope.localModel).toBe('1994-02-10');
+    expect(scope.localModel).toBe('1994-02-01');
 
     scope.monthYearOnly = false;