datepicker
parent
b0145b20d7
commit
3e0c0b9063
|
|
@ -259,12 +259,19 @@
|
|||
height: 70%;
|
||||
width: 59px;
|
||||
background-color: rgb(255, 255, 255);
|
||||
border-width: 1px;
|
||||
border: none;
|
||||
border-bottom: 1px;
|
||||
border-top-right-radius: 4px;
|
||||
border: solid 1px rgba(0, 0, 0, 0.124);
|
||||
border-radius: 8px;
|
||||
border-radius: 0px 8px 8px 0px;
|
||||
border-left: none;
|
||||
}
|
||||
|
||||
.dateButton mat-icon {
|
||||
transform: scale(0.8);
|
||||
opacity: 0.75;
|
||||
margin-right: 0px;
|
||||
}
|
||||
|
||||
.dateButton:hover>mat-icon {
|
||||
opacity: 1;
|
||||
}
|
||||
|
||||
.dateButton:hover {
|
||||
|
|
|
|||
|
|
@ -103,11 +103,11 @@
|
|||
<div class="right">
|
||||
<!-- Date Range Picker -->
|
||||
<div style="display: flex; height: 100%; align-items: center; font-size: 13px; ">
|
||||
<div style="height: 70%; display: flex; align-items: center; width: 160px; font-family: Arial, sans-serif; font-weight: 600;">
|
||||
<div style="height: 70%; display: flex; align-items: center; width: 180px; font-family: Arial, sans-serif; border: solid 1px rgba(0, 0, 0, 0.124);
|
||||
background-color: white; padding-left: 10px; border-radius: 5px 0px 0px 5px;">
|
||||
<!-- <mat-label>{{languageService.lMap.get('dateRangeLabel')}}</mat-label> -->
|
||||
<mat-date-range-input [formGroup]="range" [rangePicker]="picker">
|
||||
<input matStartDate formControlName="start"
|
||||
(dateChange)="startDateChanged($event)">
|
||||
<input matStartDate formControlName="start" (dateChange)="startDateChanged($event)">
|
||||
<input matEndDate formControlName="end" (dateChange)="endDateChanged($event)">
|
||||
</mat-date-range-input>
|
||||
<!-- <mat-datepicker-toggle matIconSuffix [for]="picker"></mat-datepicker-toggle> -->
|
||||
|
|
@ -116,8 +116,7 @@
|
|||
<mat-error *ngIf="range.controls.end.hasError('matEndDateInvalid')">Invalid end date</mat-error>
|
||||
</div>
|
||||
|
||||
<button class="dateButton"
|
||||
(click)="picker.open()"><mat-icon>calendar_today</mat-icon></button>
|
||||
<button class="dateButton" (click)="picker.open()"><mat-icon>calendar_today</mat-icon></button>
|
||||
</div>
|
||||
|
||||
<!-- Scale Picker -->
|
||||
|
|
@ -152,15 +151,15 @@
|
|||
[resources]="resources" [taskFields]="taskSettings" [resourceFields]="resourceFields" [editSettings]="editSettings"
|
||||
[columns]="columns" [toolbar]="" [labelSettings]="labelSettings" [allowSelection]='true' [allowResizing]='true'
|
||||
[highlightWeekends]='true' [treeColumnIndex]="1" [projectStartDate]="this.projectStartDate"
|
||||
[projectEndDate]="this.projectEndDate" viewType="ResourceView" [showOverAllocation]='true'
|
||||
[enableMultiTaskbar]='true' [collapseAllParentTasks]='true' [enableVirtualization]="false" [allowSorting]="true"
|
||||
[allowFiltering]="false" [timelineSettings]="timelineSettings" [selectionSettings]="selectionSettings"
|
||||
[tooltipSettings]="tooltipSettings" [splitterSettings]="splitterSettings" (actionComplete)="actionComplete($event)"
|
||||
gridLines="Both" (splitterResizing)="splitterResizing($event)" (actionBegin)="actionBegin($event)"
|
||||
[projectEndDate]="this.projectEndDate" viewType="ResourceView" [showOverAllocation]='true' [enableMultiTaskbar]='true'
|
||||
[collapseAllParentTasks]='true' [enableVirtualization]="false" [allowSorting]="true" [allowFiltering]="false"
|
||||
[timelineSettings]="timelineSettings" [selectionSettings]="selectionSettings" [tooltipSettings]="tooltipSettings"
|
||||
[splitterSettings]="splitterSettings" (actionComplete)="actionComplete($event)" gridLines="Both"
|
||||
(splitterResizing)="splitterResizing($event)" (actionBegin)="actionBegin($event)"
|
||||
(taskbarEditing)="taskbarEditing($event)" (taskbarEdited)="taskbarEdited($event)"
|
||||
(toolbarClick)="toolbarBtnClicked($event)" (rowSelected)="rowSelected($event)"
|
||||
(rowDeselected)="rowDeselected($event)" (created)="created($event)" (dataBound)="dataBound($event)"
|
||||
(load)="load($event)" (queryTaskbarInfo)="queryTaskbarInfo($event)" (expanding)="onExpand($event)">
|
||||
(toolbarClick)="toolbarBtnClicked($event)" (rowSelected)="rowSelected($event)" (rowDeselected)="rowDeselected($event)"
|
||||
(created)="created($event)" (dataBound)="dataBound($event)" (load)="load($event)"
|
||||
(queryTaskbarInfo)="queryTaskbarInfo($event)" (expanding)="onExpand($event)">
|
||||
|
||||
|
||||
<ng-template #tooltipSettingsTaskbar let-data>
|
||||
|
|
@ -246,8 +245,7 @@
|
|||
</mat-card-content>
|
||||
</mat-card>
|
||||
|
||||
<mat-card style="width: 50%; margin: auto;"
|
||||
*ngIf="!errorService.rsso && !errorService.critical && errorService.error">
|
||||
<mat-card style="width: 50%; margin: auto;" *ngIf="!errorService.rsso && !errorService.critical && errorService.error">
|
||||
<mat-card-header>
|
||||
<mat-card-title><mat-icon style="color: red;">error</mat-icon>
|
||||
{{errorService.getLastError('error').name}}</mat-card-title>
|
||||
|
|
|
|||
Loading…
Reference in New Issue