diff --git a/apps/maarch_entreprise/Views/historyBatch-administration.component.html b/apps/maarch_entreprise/Views/batchHistory-administration.component.html
similarity index 93%
rename from apps/maarch_entreprise/Views/historyBatch-administration.component.html
rename to apps/maarch_entreprise/Views/batchHistory-administration.component.html
index 6c60937283f90c423211839f082492f319922592..5b4fac7a3a2d78652fbc040bba03e08758ddf684 100644
--- a/apps/maarch_entreprise/Views/historyBatch-administration.component.html
+++ b/apps/maarch_entreprise/Views/batchHistory-administration.component.html
@@ -32,10 +32,6 @@
</div>
</div>
<mat-table #table [dataSource]="dataSource" matSort matSortActive="event_date" matSortDirection="desc">
- <ng-container matColumnDef="batch_id">
- <mat-header-cell *matHeaderCellDef mat-sort-header [class.hide-for-mobile]="mobileQuery.matches">{{lang.id}}</mat-header-cell>
- <mat-cell *matCellDef="let element" [class.hide-for-mobile]="mobileQuery.matches">{{element.batch_id}}</mat-cell>
- </ng-container>
<ng-container matColumnDef="event_date">
<mat-header-cell *matHeaderCellDef mat-sort-header>{{lang.date}}</mat-header-cell>
<mat-cell *matCellDef="let element">{{element.event_date | date : "dd/MM/y HH:mm"}}</mat-cell>
diff --git a/apps/maarch_entreprise/js/angular/app/administration/administration-routing.module.ts b/apps/maarch_entreprise/js/angular/app/administration/administration-routing.module.ts
index cad066a4720a0a205dd7443be59a9f239fd62f62..b3d28aba005de18bf9d8ae7b9726c81b532e0cf7 100644
--- a/apps/maarch_entreprise/js/angular/app/administration/administration-routing.module.ts
+++ b/apps/maarch_entreprise/js/angular/app/administration/administration-routing.module.ts
@@ -25,7 +25,7 @@ import { NotificationsAdministrationComponent } from './notifications-ad
import { NotificationAdministrationComponent } from './notification-administration.component';
import { NotificationsScheduleAdministrationComponent } from './notifications-schedule-administration.component';
import { HistoryAdministrationComponent } from './history-administration.component';
-import { HistoryBatchAdministrationComponent } from './historyBatch-administration.component';
+import { BatchHistoryAdministrationComponent } from './batchHistory-administration.component';
import { UpdateStatusAdministrationComponent } from './update-status-administration.component';
@@ -65,7 +65,7 @@ import { UpdateStatusAdministrationComponent } from './update-status-ad
{ path: 'administration/notifications/schedule', component: NotificationsScheduleAdministrationComponent },
{ path: 'administration/notifications/:identifier', component: NotificationAdministrationComponent },
{ path: 'administration/history', component: HistoryAdministrationComponent },
- { path: 'administration/historyBatch', component: HistoryBatchAdministrationComponent },
+ { path: 'administration/historyBatch', component: BatchHistoryAdministrationComponent },
{ path: 'administration/update-status', component: UpdateStatusAdministrationComponent },
]),
],
diff --git a/apps/maarch_entreprise/js/angular/app/administration/administration.module.ts b/apps/maarch_entreprise/js/angular/app/administration/administration.module.ts
index 8a534348da772411b0f9bdddd20856727324c079..ee9fc0af4a827d4f8c73198b4df2af382011ea80 100644
--- a/apps/maarch_entreprise/js/angular/app/administration/administration.module.ts
+++ b/apps/maarch_entreprise/js/angular/app/administration/administration.module.ts
@@ -29,7 +29,7 @@ import { PrioritiesAdministrationComponent } from './priorities-admin
import { PriorityAdministrationComponent } from './priority-administration.component';
import { ReportsAdministrationComponent } from './reports-administration.component';
import { HistoryAdministrationComponent } from './history-administration.component';
-import { HistoryBatchAdministrationComponent } from './historyBatch-administration.component';
+import { BatchHistoryAdministrationComponent } from './batchHistory-administration.component';
import { UpdateStatusAdministrationComponent } from './update-status-administration.component';
import { NotificationsAdministrationComponent } from './notifications-administration.component';
import { NotificationsScheduleAdministrationComponent } from './notifications-schedule-administration.component';
@@ -66,7 +66,7 @@ import { NotificationAdministrationComponent } from './notification-adm
PriorityAdministrationComponent,
ReportsAdministrationComponent,
HistoryAdministrationComponent,
- HistoryBatchAdministrationComponent,
+ BatchHistoryAdministrationComponent,
UpdateStatusAdministrationComponent,
NotificationsAdministrationComponent,
NotificationsScheduleAdministrationComponent,
diff --git a/apps/maarch_entreprise/js/angular/app/administration/historyBatch-administration.component.ts b/apps/maarch_entreprise/js/angular/app/administration/batchHistory-administration.component.ts
similarity index 68%
rename from apps/maarch_entreprise/js/angular/app/administration/historyBatch-administration.component.ts
rename to apps/maarch_entreprise/js/angular/app/administration/batchHistory-administration.component.ts
index e835c633b0e7f8971feb715cbe963ad337fb26c5..9b71d2d4b0a75a41a241ae332215fb818d5094ab 100644
--- a/apps/maarch_entreprise/js/angular/app/administration/historyBatch-administration.component.ts
+++ b/apps/maarch_entreprise/js/angular/app/administration/batchHistory-administration.component.ts
@@ -2,9 +2,7 @@ import { ChangeDetectorRef, Component, OnInit, ViewChild } from '@angular/core';
import { MediaMatcher } from '@angular/cdk/layout';
import { HttpClient } from '@angular/common/http';
import { LANG } from '../translate.component';
-import { NotificationService } from '../notification.service';
import { MatPaginator, MatTableDataSource, MatSort } from '@angular/material';
-import { MatDatepickerInputEvent } from '@angular/material/datepicker';
declare function $j(selector: any): any;
@@ -12,33 +10,36 @@ declare var angularGlobals: any;
@Component({
- templateUrl: "../../../../Views/historyBatch-administration.component.html",
- providers: [NotificationService]
+ templateUrl: "../../../../Views/batchHistory-administration.component.html"
})
-export class HistoryBatchAdministrationComponent implements OnInit {
- mobileQuery: MediaQueryList;
- private _mobileQueryListener: () => void;
- coreUrl: string;
- lang: any = LANG;
+export class BatchHistoryAdministrationComponent implements OnInit {
+
+ private _mobileQueryListener : () => void;
+ mobileQuery : MediaQueryList;
+
+ coreUrl : string;
+ lang : any = LANG;
+ loading : boolean = false;
- loading: boolean = false;
data : any[] = [];
startDate : Date = new Date();
endDate : Date = new Date();
- displayedColumns = ['batch_id', 'event_date', 'total_processed', 'total_errors', 'info', 'module_name'];
- dataSource = new MatTableDataSource(this.data);
+ displayedColumns = ['event_date', 'total_processed', 'total_errors', 'info', 'module_name'];
+ dataSource = new MatTableDataSource(this.data);
+
+
@ViewChild(MatPaginator) paginator: MatPaginator;
@ViewChild(MatSort) sort: MatSort;
applyFilter(filterValue: string) {
- filterValue = filterValue.trim(); // Remove whitespace
- filterValue = filterValue.toLowerCase(); // MatTableDataSource defaults to lowercase matches
+ filterValue = filterValue.trim();
+ filterValue = filterValue.toLowerCase();
this.dataSource.filter = filterValue;
}
- constructor(changeDetectorRef: ChangeDetectorRef, media: MediaMatcher, public http: HttpClient, private notify: NotificationService) {
+ constructor(changeDetectorRef: ChangeDetectorRef, media: MediaMatcher, public http: HttpClient) {
$j("link[href='merged_css.php']").remove();
this.startDate.setHours(0,0,0,0);
@@ -50,24 +51,14 @@ export class HistoryBatchAdministrationComponent implements OnInit {
this.mobileQuery.addListener(this._mobileQueryListener);
}
- updateBreadcrumb(applicationName: string) {
- if ($j('#ariane')[0]) {
- $j('#ariane')[0].innerHTML = "<a href='index.php?reinit=true'>" + applicationName + "</a> > <a onclick='location.hash = \"/administration\"' style='cursor: pointer'>" + this.lang.administration + "</a> > " + this.lang.historyBatch;
- }
- }
-
ngOnDestroy(): void {
this.mobileQuery.removeListener(this._mobileQueryListener);
}
ngOnInit(): void {
this.coreUrl = angularGlobals.coreUrl;
-
this.loading = true;
- this.updateBreadcrumb(angularGlobals.applicationName);
- $j('#inner_content').remove();
-
this.http.get(this.coreUrl + 'rest/batchHistories', {params: {"startDate" : (this.startDate.getTime() / 1000).toString(), "endDate" : (this.endDate.getTime() / 1000).toString()}})
.subscribe((data: any) => {
this.data = data['batchHistories'];
diff --git a/src/app/history/controllers/BatchHistoryController.php b/src/app/history/controllers/BatchHistoryController.php
index 91f7dbdd443df349c65c185a1b5d73d2e0ca0b5a..4eea69e3a0ef0ff7f764544ab1f454a58cfa7db9 100644
--- a/src/app/history/controllers/BatchHistoryController.php
+++ b/src/app/history/controllers/BatchHistoryController.php
@@ -39,7 +39,7 @@ class BatchHistoryController
$maxRequestSize = 10000;
$batchHistories = BatchHistoryModel::get([
- 'select' => ['event_date', 'module_name', 'batch_id', 'total_processed', 'total_errors', 'info'],
+ 'select' => ['event_date', 'module_name', 'total_processed', 'total_errors', 'info'],
'where' => ['event_date > ?', 'event_date < ?'],
'data' => [date('Y-m-d H:i:s', $data['startDate']), date('Y-m-d H:i:s', $data['endDate'])],
'orderBy' => ['event_date DESC'],