Sourcecode Structure Updated
parent
ed314513c1
commit
8913bebd32
|
|
@ -356,7 +356,6 @@ export class DataService {
|
|||
packageName: resp.packageName,
|
||||
coordinatorSg: resp.coordinatorSg,
|
||||
plantime: resp.planTime,
|
||||
calenderWeek: this.getWeekNumber(new Date(resp.d2))
|
||||
});
|
||||
|
||||
|
||||
|
|
@ -368,26 +367,12 @@ export class DataService {
|
|||
return promise;
|
||||
}
|
||||
|
||||
getWeekNumber(d) {
|
||||
// Copy date so don't modify original
|
||||
d = new Date(Date.UTC(d.getFullYear(), d.getMonth(), d.getDate()));
|
||||
// Set to nearest Thursday: current date + 4 - current day number
|
||||
// Make Sunday's day number 7
|
||||
d.setUTCDate(d.getUTCDate() + 4 - (d.getUTCDay()||7));
|
||||
// Get first day of year
|
||||
let yearStart : any;
|
||||
yearStart = new Date(Date.UTC(d.getUTCFullYear(),0,1));
|
||||
// Calculate full weeks to nearest Thursday
|
||||
let weekNo = Math.ceil(( ( (d - yearStart) / 86400000) + 1)/7);
|
||||
// Return array of year and week number
|
||||
return '' + d.getUTCFullYear() + weekNo;
|
||||
}
|
||||
|
||||
validateImplementerEdit(state):boolean{
|
||||
if(state == 1 || state == 3 || state == 6){
|
||||
return true
|
||||
return true;
|
||||
}else{
|
||||
return true
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -430,7 +415,6 @@ export class DataService {
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
return "";
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@
|
|||
</mat-radio-group>
|
||||
<!-- <p>Selected range: {{range.value | json}}</p> -->
|
||||
<div class="toggleContainer">
|
||||
<mat-slide-toggle color="primary" [(ngModel)]="showDetails" [checked]="showDetails" (change)="renderDetails()">{{languageService.lMap.get('detailButton')}}</mat-slide-toggle>
|
||||
<mat-slide-toggle color="primary" [(ngModel)]="showDetails" [checked]="showDetails" (change)="refreshData()">{{languageService.lMap.get('detailButton')}}</mat-slide-toggle>
|
||||
<mat-slide-toggle [disabled]="filters == null" (change)="refreshData()" color="primary" [(ngModel)]="filterEnabled" [checked]="filterEnabled" (change)="applyFilter()">{{languageService.lMap.get('filterButton')}}</mat-slide-toggle>
|
||||
<mat-slide-toggle color="primary" [(ngModel)]="sortEnabled" [checked]="sortEnabled" >{{languageService.lMap.get('sortButton')}}</mat-slide-toggle>
|
||||
<button mat-icon-button aria-label="clear Filters and Sort" (click)="clearFilter()">
|
||||
|
|
@ -100,7 +100,6 @@
|
|||
(created)="created($event)"
|
||||
(dataBound)="dataBound($event)"
|
||||
(load)="load($event)"
|
||||
(onIntlChange)="onChange($event)"
|
||||
(queryTaskbarInfo) = "queryTaskbarInfo($event)"
|
||||
(expanding)="onExpand($event)"
|
||||
(splitterResized)="onResizing($event)"
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue