ソースを参照

Merge branch 'hotfix-v1.2.2' of onunez/soma-frontend into master

Oscar José Nuñez Chávez 6 年 前
コミット
ab832982cc
2 ファイル変更7 行追加4 行削除
  1. 3 1
      src/app/app.module.ts
  2. 4 3
      src/app/components/assets/assets.component.ts

+ 3 - 1
src/app/app.module.ts

@@ -4,7 +4,7 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { NgModule } from '@angular/core';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { HttpClientModule, HTTP_INTERCEPTORS } from '@angular/common/http';
-import { registerLocaleData } from '@angular/common';
+import { registerLocaleData, DatePipe } from '@angular/common';
 import { RouterModule } from '@angular/router';
 
 
@@ -63,6 +63,8 @@ import { ConfirmAccountComponent } from './components/confirm-account/confirm-ac
   ],
   providers: [
     { provide: HTTP_INTERCEPTORS, useClass: TokenInterceptor, multi: true },
+    [DatePipe]
+
     //{ provide: HTTP_INTERCEPTORS, useClass: ErrorInterceptor, multi: true },
     //AuthenticationService,
     // provider used to create fake backend

+ 4 - 3
src/app/components/assets/assets.component.ts

@@ -12,7 +12,7 @@ import { MatSort } from '@angular/material/sort';
 import { MatTableDataSource } from '@angular/material/table';
 import Swal from 'sweetalert2';
 import { HttpClient } from '@angular/common/http';
-import { formatDate } from '@angular/common';
+import { formatDate, DatePipe } from '@angular/common';
 
 import {AngularMyDatePickerDirective,IAngularMyDpOptions, IMyDateModel} from 'angular-mydatepicker';
 import printJS from 'print-js'
@@ -103,7 +103,8 @@ export class AssetsComponent implements OnInit {
     private plantsService: PlantsService,
     private http: HttpClient,
     private logsService: LogsService,
-    private measService: MeasuresService) {
+    private measService: MeasuresService,
+    public datepipe: DatePipe) {
       
       this.route.queryParams.subscribe(params => {
         this.organizationId = params['id'];
@@ -119,7 +120,7 @@ export class AssetsComponent implements OnInit {
 
   ngOnInit() {
     // Default date is today and set it on a string var and initialize dateRange plugin
-    this.initialDate = new Date().toISOString().slice(0, 10);
+    this.initialDate = this.datepipe.transform(new Date(), 'yyyy-MM-dd')//.toISOString().slice(0, 10);
     if (this.myDateInit) {
       let begin: Date = new Date();
       this.model = {