Merge pull request #285 from MadhuMosip/develop

MOSIP-21335 displaying local time instead of UTC
mosip · Feb 22, 2024 · 4e280be · 4e280be
2 parents ee24b99 + e04c0af
commit 4e280be
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/admin-ui/src/app/features/bulkupload/masterdataupload/singleview/singleview.component.html b/admin-ui/src/app/features/bulkupload/masterdataupload/singleview/singleview.component.html
@@ -48,7 +48,7 @@ <h3>{{data.transcationId}}</h3>
             </mat-form-field>
             <mat-form-field>
               <mat-label>Date and Time</mat-label>
-              <input matInput placeholder="Table Name" id="timeStamp" value="{{data.timeStamp | date:'short'}}" readonly>
+              <input matInput placeholder="Table Name" id="timeStamp" value="{{localDate | date:'short'}}" readonly>
             </mat-form-field> 
           </div> 
           <div style="width: 10%">

diff --git a/admin-ui/src/app/features/bulkupload/masterdataupload/singleview/singleview.component.ts b/admin-ui/src/app/features/bulkupload/masterdataupload/singleview/singleview.component.ts
@@ -18,6 +18,7 @@ export class SingleviewComponent {
   tableNames = [{ id:"applicant_valid_document", value:"ApplicantValidDocument"}, { id:"appl_form_type", value:"Application"}, { id:"biometric_attribute", value:"BiometricAttribute"}, { id:"biometric_type", value:"BiometricType"}, { id:"blacklisted_words", value:"BlacklistedWords"}, { id:"daysofweek_list", value:"DaysOfWeek"}, { id:"device_master", value:"Device"}, { id:"registered_device_master", value:"DeviceRegister"}, { id:"device_spec", value:"DeviceSpecification"}, { id:"device_type", value:"DeviceType"}, { id:"doc_category", value:"DocumentCategory"}, { id:"doc_type", value:"DocumentType"}, { id:"dynamic_field", value:"DynamicField"}, { id:"reg_exceptional_holiday", value:"ExceptionalHoliday"}, { id:"foundational_trust_provider", value:"FoundationalTrustProvider"},  { id:"gender", value:"Gender"}, { id:"loc_holiday", value:"Holiday"}, { id:"identity_schema", value:"IdentitySchema"}, { id:"id_type", value:"IdType"}, { id:"individual_type", value:"IndividualType"}, { id:"language", value:"Language"}, { id:"location", value:"Location"}, { id:"loc_hierarchy_list", value:"LocationHierarchy"}, { id:"machine_master", value:"Machine"}, { id:"machine_spec", value:"MachineSpecification"}, { id:"machine_type", value:"MachineType"}, { id:"module_detail", value:"ModuleDetail"}, { id:"mosip_device_service", value:"MOSIPDeviceService"}, { id:"reason_category", value:"ReasonCategory"}, { id:"reason_list", value:"ReasonList"}, { id:"reg_exceptional_holiday", value:"RegExceptionalHoliday"}, { id:"registered_device_master", value:"RegisteredDevice"}, { id:"registration_center", value:"RegistrationCenter"}, { id:"reg_center_device", value:"RegistrationCenterDevice"}, { id:"reg_center_machine", value:"RegistrationCenterMachine"}, { id:"reg_center_machine_device", value:"RegistrationCenterMachineDevice"}, { id:"reg_center_type", value:"RegistrationCenterType"}, { id:"reg_center_user", value:"RegistrationCenterUser"}, { id:"reg_center_user_machine", value:"RegistrationCenterUserMachine"}, { id:"reg_device_sub_type", value:"RegistrationDeviceSubType"}, { id:"reg_device_type", value:"RegistrationDeviceType"}, { id:"reg_working_nonworking", value:"RegWorkingNonWorking"}, { id:"schema_def", value:"SchemaDefinition"}, { id:"template", value:"Template"}, { id:"template_file_format", value:"TemplateFileFormat"}, { id:"template_type", value:"TemplateType"}, { id:"title", value:"Title"}, { id:"user_detail", value:"UserDetails"}, { id:"valid_document", value:"ValidDocument"}, { id:"zone", value:"Zone"}, { id:"zone_user", value:"ZoneUser"}];
   subscribed: any;
   data : any;
+  localDate:any;
   constructor(
   private bulkuploadService: BulkuploadService,
   private location: Location,
@@ -46,6 +47,7 @@ export class SingleviewComponent {
       console.log(response);
       if (response != null) {     
         this.data = response;
+        this.localDate = new Date(this.data.timeStamp + "z").toLocaleString();
       }
     });
   }

diff --git a/admin-ui/src/app/features/bulkupload/packetdataupload/singleview/singleview.component.html b/admin-ui/src/app/features/bulkupload/packetdataupload/singleview/singleview.component.html
@@ -40,7 +40,7 @@ <h3>{{data.transcationId}}</h3>
             </mat-form-field>
             <mat-form-field>
               <mat-label>{{'packet-upload.singleView.dataAndTime-txt'|translate}}</mat-label>
-              <input matInput placeholder="{{'packet-upload.singleView.placeHolder1-txt'|translate}}" id="timeStamp" value="{{data.timeStamp | date:'short'}}" readonly>
+              <input matInput placeholder="{{'packet-upload.singleView.placeHolder1-txt'|translate}}" id="timeStamp" value="{{localDate | date:'short'}}" readonly>
             </mat-form-field> 
           </div> 
           <div style="width: 10%">

diff --git a/admin-ui/src/app/features/bulkupload/packetdataupload/singleview/singleview.component.ts b/admin-ui/src/app/features/bulkupload/packetdataupload/singleview/singleview.component.ts
@@ -19,6 +19,7 @@ export class SingleviewComponent {
   tableNames = [{ id: 'applicant_valid_document', value: 'ApplicantValidDocument'}, { id: 'appl_form_type', value: 'Application'}, { id: 'biometric_attribute', value: 'BiometricAttribute'}, { id: 'biometric_type', value: 'BiometricType'}, { id: 'blacklisted_words', value: 'BlacklistedWords'}, { id: 'daysofweek_list', value: 'DaysOfWeek'}, { id: 'device_master', value: 'Device'}, { id: 'registered_device_master', value: 'DeviceRegister'}, { id: 'device_spec', value: 'DeviceSpecification'}, { id: 'device_type', value: 'DeviceType'}, { id: 'doc_category', value: 'DocumentCategory'}, { id: 'doc_type', value: 'DocumentType'}, { id: 'dynamic_field', value: 'DynamicField'}, { id: 'reg_exceptional_holiday', value: 'ExceptionalHoliday'}, { id: 'foundational_trust_provider', value: 'FoundationalTrustProvider'},  { id: 'gender', value: 'Gender'}, { id: 'loc_holiday', value: 'Holiday'}, { id: 'identity_schema', value: 'IdentitySchema'}, { id: 'id_type', value: 'IdType'}, { id: 'individual_type', value: 'IndividualType'}, { id: 'language', value: 'Language'}, { id: 'location', value: 'Location'}, { id: 'loc_hierarchy_list', value: 'LocationHierarchy'}, { id: 'machine_master', value: 'Machine'}, { id: 'machine_spec', value: 'MachineSpecification'}, { id: 'machine_type', value: 'MachineType'}, { id: 'module_detail', value: 'ModuleDetail'}, { id: 'mosip_device_service', value: 'MOSIPDeviceService'}, { id: 'reason_category', value: 'ReasonCategory'}, { id: 'reason_list', value: 'ReasonList'}, { id: 'reg_exceptional_holiday', value: 'RegExceptionalHoliday'}, { id: 'registered_device_master', value: 'RegisteredDevice'}, { id: 'registration_center', value: 'RegistrationCenter'}, { id: 'reg_center_device', value: 'RegistrationCenterDevice'}, { id: 'reg_center_machine', value: 'RegistrationCenterMachine'}, { id: 'reg_center_machine_device', value: 'RegistrationCenterMachineDevice'}, { id: 'reg_center_type', value: 'RegistrationCenterType'}, { id: 'reg_center_user', value: 'RegistrationCenterUser'}, { id: 'reg_center_user_machine', value: 'RegistrationCenterUserMachine'}, { id: 'reg_device_sub_type', value: 'RegistrationDeviceSubType'}, { id: 'reg_device_type', value: 'RegistrationDeviceType'}, { id: 'reg_working_nonworking', value: 'RegWorkingNonWorking'}, { id: 'schema_def', value: 'SchemaDefinition'}, { id: 'template', value: 'Template'}, { id: 'template_file_format', value: 'TemplateFileFormat'}, { id: 'template_type', value: 'TemplateType'}, { id: 'title', value: 'Title'}, { id: 'user_detail', value: 'UserDetails'}, { id: 'valid_document', value: 'ValidDocument'}, { id: 'zone', value: 'Zone'}, { id: 'zone_user', value: 'ZoneUser'}];
   subscribed: any;
   data: any;
+  localDate:any;
   constructor(
   private bulkuploadService: BulkuploadService,
   private location: Location,
@@ -47,6 +48,7 @@ export class SingleviewComponent {
       console.log(response);
       if (response != null) {
         this.data = response;
+        this.localDate = new Date(this.data.timeStamp + "z").toLocaleString();
       }
     });
   }