Skip to content

B
BookingMyHrManagement
Commit 3c259ec9 by Your Name
Options

Update all

parent 6ea5f60b
Showing with 19 additions and 25 deletions
src/app/pages/admin-equirment/admin-equirment.component.html
......@@ -28,8 +28,7 @@
<div class="card" style="
padding: 10px;">
<div class="card-body">
<img style="height: 200px;
width: 200px;" [src]="item.rPic" class="nav justify-content-center"
<img style="object-fit: cover;" [src]="item.rPic" class="nav justify-content-center"
alt="...">
<br>
<p class="text-left">ชื่อ : {{item.rName}}</p>
......@@ -84,8 +83,7 @@
<div class="card" style="
padding: 10px;">
<div class="card-body">
<img style="height: 200px;
width: 200px;" [src]="item.eqPic" class="nav justify-content-center"
<img style="object-fit: cover;" [src]="item.eqPic" class="nav justify-content-center"
alt="...">
<br>
<p class="text-left">ชื่อ : {{item.eqName}}</p>
......
src/app/pages/admin-pending/admin-pending.component.html
......@@ -87,7 +87,7 @@
</thead>
<tbody>
<tr *ngFor="let item of listRoomDetail">
<th scope="row">{{ item.id }}</th>
<th scope="row" style="color: rgb(255, 255, 255);">{{ item.id }}</th>
<td>{{ item.room.rType }}</td>
<td>{{ item.room.rName }}</td>
<td>{{ item.room.rDesc }}</td>
......@@ -144,12 +144,11 @@
<th scope="col">วันที่เริ่มต้น</th>
<th scope="col">จำนวน</th>
<th scope="col">สถานะ</th>
<th scope="col">วันที่สิ้นสุด</th>
</tr>
</thead>
<tbody>
<tr *ngFor="let item of listItemDetail">
<th scope="row">{{ item.id }}</th>
<th scope="row" style="color: rgb(255, 255, 255);">{{ item.id }}</th>
<td>{{ item.equirment.eqType }}</td>
<td>{{ item.equirment.eqName }}</td>
<td>{{ item.equirment.eqDesc }}</td>
......@@ -159,8 +158,7 @@
<td *ngIf="item.eStatus==0">รอดำเนินการ</td>
<td *ngIf="item.eStatus==1">อนุมัติ</td>
<td *ngIf="item.eStatus==2">ยกเลิก</td>
<td *ngIf="item.eStatus==3">สำเร็จแล้ว</td>
<td>{{ item.eDate | date : 'dd/MM/yyyy'}}</td>
<td *ngIf="item.eStatus==3">คืนแล้ว</td>
<div class="col-auto align-self-sm-center">
<button type="button" class="btn btn-info btn-sm btn-circle "
style="line-height: 0px" (click)="openItemDetail(lend,item)"><i
......@@ -251,13 +249,13 @@
<div class="row" >
<div class="col-6 mb-1">
<label for="exampleFormControlSelect1">วันที่เริ่มต้น</label>
<input type="date" class="form-control" [(ngModel)]="sDate" formControlName="sDate" />
<input type="date" class="form-control" [(ngModel)]="modelRoomDetail.sDate" formControlName="sDate" />
<div style="color: red;" *ngIf="myFormRoom.controls.sDate.status=='INVALID'">
กรุณากรอกวันที่เริ่มต้นการจอง.</div>
</div>
<div class="col-6 mb-1">
<label for="exampleFormControlSelect1">วันที่สิ้นสุด</label>
<input type="date" class="form-control" [(ngModel)]="eDate" formControlName="eDate" />
<input type="date" class="form-control" [(ngModel)]="modelRoomDetail.eDate" formControlName="eDate" />
<div style="color: red;" *ngIf="myFormRoom.controls.eDate.status=='INVALID'">
กรุณากรอกวันที่สิ้นสุดการจอง.</div>
</div>
......@@ -365,7 +363,7 @@
<div class="row">
<div class="col-sm-12 mb-1">
<label for="exampleFormControlSelect1">วันที่เริ่มต้น</label>
<input type="date" class="form-control" [(ngModel)]="sDate" formControlName="sDate" />
<input type="date" class="form-control" [(ngModel)]="modelItemDetail.sDate" formControlName="sDate" />
<div style="color: red;" *ngIf="myFormEquir.controls.sDate.status=='INVALID'">
กรุณากรอกวันที่เริ่มต้นการเบิก</div>
</div>
......@@ -420,7 +418,7 @@
<div class="row" *ngIf="modelItemDetail.returnItem">
<div class="col-sm-12 mb-1">
<label for="exampleFormControlSelect1">วันที่สิ้นสุด</label>
<input type="date" class="form-control" [(ngModel)]="eDate" formControlName="eDate" />
<input type="date" class="form-control" [value]="modelItemDetail.eDate" formControlName="eDate" />
</div>
</div>
</form>
......
src/app/pages/contact-admin/contact-admin.component.html
......@@ -18,7 +18,7 @@
</thead>
<tbody>
<tr *ngFor="let item of listContact">
<th scope="row">{{ item.id }}</th>
<th scope="row" style="color: rgb(255, 255, 255);">{{ item.id }}</th>
<td>{{ item.ctHead }}</td>
<td>{{ item.ctTab }}</td>
<td>{{ item.ctName }}</td>
......
src/app/pages/equipment/equipment.component.html
......@@ -24,8 +24,7 @@
<div class="card" style="
padding: 10px;">
<div class="card-body">
<img style="height: 200px;
width: 200px;" [src]="item.rPic" class="nav justify-content-center"
<img style="object-fit: cover;" [src]="item.rPic" class="nav justify-content-center"
alt="...">
<br>
<p class="text-left">ชื่อ : {{item.rName}}</p>
......@@ -74,8 +73,7 @@
<div class="card" style="
padding: 10px;">
<div class="card-body">
<img style="height: 200px;
width: 200px;" [src]="item.eqPic" class="nav justify-content-center"
<img style="object-fit: cover;" [src]="item.eqPic" class="nav justify-content-center"
alt="...">
<br>
<p class="text-left">ชื่อ : {{item.eqName}}</p>
......
src/app/pages/home-page/home-page-calendar.component.html
......@@ -45,7 +45,7 @@
<div class="col-12 mb-1">
<div class=" form-check">
<label class=" form-check-label">
<input class=" form-check" type="checkbox" [checked]='roomSelect.allDay' />
<input class=" form-check" type="checkbox" disabled [checked]='roomSelect.allDay' />
<span class=" form-check-sign">
<span class="check">ทั้งวัน</span>
</span>
......@@ -53,7 +53,7 @@
</div>
</div>
</div>
<div class="row" disabled='roomSelect.allDay.valid'>
<div class="row" >
<div class="col-6 mb-1">
<label for="exampleFormControlSelect1">เวลาที่เริ่มต้น</label>
<input readonly class="form-control" type="time" value={{roomSelect.sTime}} style="color: aliceblue;">
......
src/app/pages/pending/pending.component.html
......@@ -87,7 +87,7 @@
</thead>
<tbody>
<tr *ngFor="let item of listRoomDetail">
<th scope="row">{{ item.id }}</th>
<th scope="row" style="color: rgb(255, 255, 255);">{{ item.id }}</th>
<td>{{ item.room.rType }}</td>
<td>{{ item.room.rName }}</td>
<td>{{ item.room.rDesc }}</td>
......@@ -149,7 +149,7 @@
</thead>
<tbody>
<tr *ngFor="let item of listItemDetail">
<th scope="row">{{ item.id }}</th>
<th scope="row" style="color: rgb(255, 255, 255);">{{ item.id }}</th>
<td>{{ item.equirment.eqType }}</td>
<td>{{ item.equirment.eqName }}</td>
<td>{{ item.equirment.eqDesc }}</td>
......@@ -242,11 +242,11 @@
<div class="row">
<div class="col-6 mb-1">
<label for="exampleFormControlSelect1">วันที่เริ่มต้น</label>
<input readonly type="date" class="form-control" [(ngModel)]="sDate">
<input readonly type="date" class="form-control" [(ngModel)]="modelRoomDetail.sDate">
</div>
<div class="col-6 mb-1">
<label for="exampleFormControlSelect1">วันที่สิ้นสุด</label>
<input readonly type="date" class="form-control" [(ngModel)]="eDate">
<input readonly type="date" class="form-control" [(ngModel)]="modelRoomDetail.eDate">
</div>
</div>
<div class="row">
......@@ -322,7 +322,7 @@
<div class="row">
<div class="col-6 mb-1">
<label for="exampleFormControlSelect1">วันที่เริ่มต้น</label>
<input readonly type="date" class="form-control" [(ngModel)]="sDate">
<input readonly type="date" class="form-control" [(ngModel)]="modelItemDetail.sDate">
</div>
</div>
<div class="row">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment