Merge pull request #36 from AncyRiju/develop

date changes and report time change
PSMRI · Nov 8, 2023 · 7ee9d95 · 7ee9d95
2 parents 2e5e647 + 5949139
commit 7ee9d95
Show file tree

Hide file tree

Showing 10 changed files with 25 additions and 23 deletions.
diff --git a/...modules/associate-anm-mo/beneficiary-call-history/beneficiary-call-history.component.html b/...modules/associate-anm-mo/beneficiary-call-history/beneficiary-call-history.component.html
@@ -44,7 +44,7 @@ <h2 class="inner mainHeading fontStyleHeading">{{ currentLanguageSet?.benCallHis
             <mat-expansion-panel *ngFor="let item of benHistoryData" (afterExpand)="getCallHistoryDetails(item.obCallId)">
               <mat-expansion-panel-header>
                 <mat-panel-title>
-                  <b class="fontHeaderStyle">{{item.displayEcdCallType}}-{{item.lastModDate | date: 'MM/DD/YYYY'}}</b>
+                  <b class="fontHeaderStyle">{{item.displayEcdCallType}}-{{item.lastModDate | date: 'MM/dd/yyyy'}}</b>
                 </mat-panel-title>
               </mat-expansion-panel-header>
               <mat-panel-description>
@@ -208,7 +208,7 @@ <h2 class="inner mainHeading fontStyleHeading">{{ currentLanguageSet?.benCallHis
                       matInput
                       placeholder=""
                       id="lmpDate"
-                      [value]="beneficiaryCallDetails.lmpDate | date: 'MM/DD/YYYY'"
+                      [value]="beneficiaryCallDetails.lmpDate | date: 'MM/dd/yyyy'"
                       appMobileNumber
                       type="text"
                       defaultNull
@@ -229,7 +229,7 @@ <h2 class="inner mainHeading fontStyleHeading">{{ currentLanguageSet?.benCallHis
                       matInput
                       placeholder=""
                       id="dateOfBirth"
-                      [value]="beneficiaryCallDetails.dob |date: 'MM/DD/YYYY'"
+                      [value]="beneficiaryCallDetails.dob |date: 'MM/dd/yyyy'"
                       appMobileNumber
                       type="text"
                       defaultNull

diff --git a/src/app/app-modules/core/call-statistics/call-statistics.component.html b/src/app/app-modules/core/call-statistics/call-statistics.component.html
@@ -8,7 +8,7 @@
         {{ currentLanguageSet?.callStatistics }}
       </p>
       <p class="inner titleDisplay" style="float: right">
-        {{ today | date : "MM/DD/YYYY - HH:mm:ss" }}
+        {{ today | date : "MM/dd/yyyy - HH:mm:ss" }}
       </p>
     </div>
 

diff --git a/src/app/app-modules/core/rating/rating.component.html b/src/app/app-modules/core/rating/rating.component.html
@@ -43,7 +43,7 @@
     <ng-container matColumnDef="date">
       <th mat-header-cell style="border-bottom: none" *matHeaderCellDef>{{ currentLanguageSet?.date }}</th>
       <td mat-cell *matCellDef="let element">
-        {{element.date | date: 'MM/DD/YYYY'}}
+        {{element.date | date: 'MM/dd/yyyy'}}
       </td>
     </ng-container>
 

diff --git a/src/app/app-modules/quality-auditor/view-casesheet/view-casesheet.component.html b/src/app/app-modules/quality-auditor/view-casesheet/view-casesheet.component.html
@@ -37,7 +37,7 @@ <h2 style="margin-top:-15px;">
                             <th id="childName">{{ currentLanguageSet?.childName}}</th>
                             <td> {{beneficiaryCaseSheetData?.beneficiaryName}} </td>
                               <th id="createdDate"> {{ currentLanguageSet?.createdDate }}</th>
-                              <td> {{beneficiaryCaseSheetData?.createdDate | date: 'MM/DD/YYYY' }} </td>
+                              <td> {{beneficiaryCaseSheetData?.createdDate | date: 'MM/dd/yyyy' }} </td>
                            </tr>
 
                           <tr>
@@ -61,14 +61,14 @@ <h2 style="margin-top:-15px;">
                             <th id="age" *ngIf ="!beneficiaryCaseSheetData?.childId">{{ currentLanguageSet?.age}}</th>
                             <td *ngIf ="!beneficiaryCaseSheetData?.childId"> {{beneficiaryCaseSheetData?.age}}  </td>
                             <th *ngIf="beneficiaryCaseSheetData?.childId" id="dob">{{ currentLanguageSet?.dob}}</th>
-                            <td *ngIf="beneficiaryCaseSheetData?.childId">{{beneficiaryCaseSheetData?.dateOfBirth | date: 'MM/DD/YYYY' }} </td>
+                            <td *ngIf="beneficiaryCaseSheetData?.childId">{{beneficiaryCaseSheetData?.dateOfBirth | date: 'MM/dd/yyyy' }} </td>
                           </tr>
 
                           <tr *ngIf="!beneficiaryCaseSheetData?.childId">
                             <th id="lmp">{{ currentLanguageSet?.lmp}}</th>
-                            <td> {{beneficiaryCaseSheetData?.lmp | date: 'MM/DD/YYYY'}} </td>
+                            <td> {{beneficiaryCaseSheetData?.lmp | date: 'MM/dd/yyyy'}} </td>
                             <th id="edd">{{ currentLanguageSet?.edd}}</th>
-                            <td> {{beneficiaryCaseSheetData?.edd | date: 'MM/DD/YYYY'}}</td>
+                            <td> {{beneficiaryCaseSheetData?.edd | date: 'MM/dd/yyyy'}}</td>
                           </tr>
                           <tr>
                             <th id="address">{{ currentLanguageSet?.address}}</th>
@@ -96,7 +96,7 @@ <h2 style="margin-top:-15px;">
                           </tr>
                           <tr  *ngIf = "!beneficiaryCaseSheetData?.childId">
                             <th id="createdDate"> {{ currentLanguageSet?.createdDate }}</th>
-                            <td> {{beneficiaryCaseSheetData?.createdDate | date: 'MM/DD/YYYY' }} </td>
+                            <td> {{beneficiaryCaseSheetData?.createdDate | date: 'MM/dd/yyyy' }} </td>
                           </tr>
 
                     </tbody>
@@ -162,7 +162,7 @@ <h2 style="margin-top:-15px;">
                       </tr>
                       <tr>
                         <th id="nextAttemptDate"> {{ currentLanguageSet?.nextAttemptDate }}</th>
-                        <td> {{beneficiaryCaseSheetData?.nextAttemptDate | date: 'MM/DD/YYYY'}} </td>
+                        <td> {{beneficiaryCaseSheetData?.nextAttemptDate | date: 'MM/dd/yyyy'}} </td>
                         <th id="callRemarks"> {{ currentLanguageSet?.callRemarks }}</th>
                         <td> {{beneficiaryCaseSheetData?.callRemarks}} </td>
                       </tr>
@@ -174,7 +174,7 @@ <h2 style="margin-top:-15px;">
                       </tr>
                       <!-- <tr>
                         <th id="createdDate"> {{ currentLanguageSet?.createdDate }}</th>
-                        <td> {{beneficiaryCaseSheetData?.createdDate | date: 'MM/DD/YYYY'}} </td>
+                        <td> {{beneficiaryCaseSheetData?.createdDate | date: 'MM/dd/yyyy'}} </td>
                       </tr> -->
                 </tbody>
 

diff --git a/...modules/supervisor/activities/alerts/alert-notification/alert-notification.component.html b/...modules/supervisor/activities/alerts/alert-notification/alert-notification.component.html
@@ -24,7 +24,7 @@ <h2 class="inner fontStyle">{{ currentLanguageSet?.alerts }}</h2>
           style="padding: 15px; width: 320px; font-size: 12px !important;"
           class="fontStyleDate">
           <mat-label>{{ currentLanguageSet?.enterDateRange }}</mat-label>
-          <mat-date-range-input [rangePicker]="picker" >
+          <mat-date-range-input [rangePicker]="picker" > 
             <input
               matStartDate
               formControlName="start"
@@ -125,13 +125,13 @@ <h2 class="inner fontStyle">{{ currentLanguageSet?.alerts }}</h2>
           <th mat-header-cell *matHeaderCellDef style="border-bottom: none">
             {{ currentLanguageSet?.validFrom }}
           </th>
-          <td mat-cell *matCellDef="let element" style="text-align: center !important;">{{ element.validFrom |utcdate| date: 'MM/DD/YYYY' }}</td>
+          <td mat-cell *matCellDef="let element" style="text-align: center !important;">{{ element.validFrom |utcdate| date: 'MM/dd/yyyy' }}</td>
         </ng-container>
         <ng-container matColumnDef="validTill">
           <th mat-header-cell *matHeaderCellDef style="border-bottom: none">
             {{ currentLanguageSet?.validTill }}
           </th>
-          <td mat-cell *matCellDef="let element" style="text-align: center !important;">{{ element.validTill |utcdate| date: 'MM/DD/YYYY' }}</td>
+          <td mat-cell *matCellDef="let element" style="text-align: center !important;">{{ element.validTill |utcdate| date: 'MM/dd/yyyy' }}</td>
         </ng-container>
         <!-- <ng-container matColumnDef="publish">
           <th mat-header-cell *matHeaderCellDef style="border-bottom: none">

diff --git a/...es/notification-supervisor/supervisor-notification/supervisor-notification.component.html b/...es/notification-supervisor/supervisor-notification/supervisor-notification.component.html
@@ -117,13 +117,13 @@ <h2 class="inner fontStyle">{{ currentLanguageSet?.notifications }}</h2>
       <th mat-header-cell *matHeaderCellDef style="border-bottom: none">
         {{ currentLanguageSet?.validFrom }}
       </th>
-      <td mat-cell *matCellDef="let element" style="text-align: center !important;">{{ element.validFrom |utcdate| date: 'MM/DD/YYYY' }}</td>
+      <td mat-cell *matCellDef="let element" style="text-align: center !important;">{{ element.validFrom |utcdate| date: 'MM/dd/yyyy' }}</td>
     </ng-container>
     <ng-container matColumnDef="validTill">
       <th mat-header-cell *matHeaderCellDef style="border-bottom: none">
         {{ currentLanguageSet?.validTill }}
       </th>
-      <td mat-cell *matCellDef="let element" style="text-align: center !important;">{{ element.validTill |utcdate| date: 'MM/DD/YYYY' }}</td>
+      <td mat-cell *matCellDef="let element" style="text-align: center !important;">{{ element.validTill |utcdate| date: 'MM/dd/yyyy' }}</td>
     </ng-container>
     <!-- <ng-container matColumnDef="publish">
       <th mat-header-cell *matHeaderCellDef style="border-bottom: none">

diff --git a/...activities/supervisor-locationMessages/location-messages/location-messages.component.html b/...activities/supervisor-locationMessages/location-messages/location-messages.component.html
@@ -99,11 +99,11 @@ <h2 class="inner fontStyle">{{currentLanguageSet?.locationMessages}}</h2>
       </ng-container>
       <ng-container matColumnDef="validFrom">
         <th mat-header-cell *matHeaderCellDef style="border-bottom: none">{{currentLanguageSet?.validFrom}}</th>
-        <td mat-cell *matCellDef="let element" style="text-align: center !important;">{{ element.validFrom |utcdate| date: 'MM/DD/YYYY' }}</td>
+        <td mat-cell *matCellDef="let element" style="text-align: center !important;">{{ element.validFrom |utcdate| date: 'MM/dd/yyyy' }}</td>
       </ng-container>
       <ng-container matColumnDef="validTill">
         <th mat-header-cell *matHeaderCellDef style="border-bottom: none">{{currentLanguageSet?.validTill}}</th>
-        <td mat-cell *matCellDef="let element" style="text-align: center !important;">{{ element.validTill |utcdate| date: 'MM/DD/YYYY' }}</td>
+        <td mat-cell *matCellDef="let element" style="text-align: center !important;">{{ element.validTill |utcdate| date: 'MM/dd/yyyy' }}</td>
       </ng-container>
       <!-- <ng-container matColumnDef="publish">
         <th mat-header-cell *matHeaderCellDef style="border-bottom: none">{{currentLanguageSet?.publish}}</th>

diff --git a/...-modules/supervisor/supervisor-reports/supervisor-reports/supervisor-reports.component.ts b/...-modules/supervisor/supervisor-reports/supervisor-reports/supervisor-reports.component.ts
@@ -215,8 +215,10 @@ export class SupervisorReportsComponent implements OnInit {
   downloadReport(report:any,formData:any){
       console.log(report)
     let reqObj = {
-      startDate:moment(formData.startDate).format('YYYY-MM-DDThh:mm:ssZ'),
-      endDate:moment(formData.endDate).format('YYYY-MM-DDThh:mm:ssZ'),
+      // startDate:moment(formData.startDate).format('YYYY-MM-DDThh:mm:ssZ'),
+      // endDate:moment(formData.endDate).format('YYYY-MM-DDThh:mm:ssZ'),
+      startDate: moment(formData.startDate).startOf('day').format('YYYY-MM-DDTHH:mm:ss'),
+      endDate: moment(formData.endDate).endOf('day').format('YYYY-MM-DDTHH:mm:ss'),
       role:formData.roleName,
       agentId:(formData.agentId !== undefined) ? formData.agentId : null,
       fileName:report.value,

diff --git a/src/app/app-modules/user-login/forgot-password/forgot-password.component.html b/src/app/app-modules/user-login/forgot-password/forgot-password.component.html
@@ -5,7 +5,7 @@
                 <mat-card-title>
                     <div class="pull-right">
                         <p class="timeDisplay fontStyle">
-                        <strong> {{ today | date : "MM/DD/YYYY - h:mm:ss" }}</strong>
+                        <strong> {{ today | date : "MM/dd/yyyy - h:mm:ss" }}</strong>
                         </p>
                     </div>
                     <div>

diff --git a/src/app/app-modules/user-login/login/login.component.html b/src/app/app-modules/user-login/login/login.component.html
@@ -10,7 +10,7 @@
         <mat-card-title>
           <div class="pull-right">
             <p class="timeDisplay fontStyle">
-              <strong> {{ today | date : "MM/DD/YYYY - HH:mm:ss" }}</strong>
+              <strong> {{ today | date : "MM/dd/yyyy - HH:mm:ss" }}</strong>
             </p>
           </div>
           <div>