Update หน้าadminการเบิก มีปุ่มcheckbox

src/app/models/itemDetail.model.ts

@@ -14,6 +14,7 @@ export class ItemDetail {
     email: string;
     remark: string;
     allDay: boolean;
+    returnItem : boolean;
     constructor(init?: ItemDetail) {
         Object.assign(this, init);
         this.id = 1;
@@ -27,6 +28,7 @@ export class ItemDetail {
         this.email = '';
         this.remark = '';
         this.allDay = true;
+        this.returnItem = false;
     }
 }
 

src/app/pages/admin-pending/admin-pending.component.ts

@@ -126,7 +126,8 @@ export class AdminPendingComponent implements OnInit {
       Quantity: new FormControl(this.modelItemDetail.Quantity, [Validators.required]),
       Remark: new FormControl(this.modelItemDetail.remark),
       eStatus: new FormControl(this.modelItemDetail.eStatus),
-      allDay: new FormControl(this.modelItemDetail.allDay)
+      allDay: new FormControl(this.modelItemDetail.allDay),
+      returnItem: new FormControl(this.modelItemDetail.returnItem)
     })
     this.modalService.open(content, { ariaLabelledBy: 'modal-basic-title' }).result.then((result) => {
       this.closeResult = `Closed with: ${result}`;

src/app/pages/equipment/equipment.component.html

@@ -359,7 +359,7 @@
             </div>
             <div class=" card-footer">
                 <button class=" btn btn-fill btn-danger" [disabled]="" type="button" (click)="saveBook()">Save</button>
-                <button class=" btn btn-fill btn-danger" type="close">Cancel</button>
+                <button class=" btn btn-fill btn-danger" type="cancel" (click)="modal.dismiss('Cross click')">Cancel</button>
             </div>
         </div>
     </div>
@@ -424,7 +424,7 @@
                         </div>
                     </div>
                     <div class="row">
-                        <div class="col-6 mb-1">
+                        <div class="col-sm-12 mb-1">
                             <label for="exampleFormControlSelect1">วันที่เริ่มต้น</label>
                             <input type="date" class="form-control" value="" [(ngModel)]="modelItemDetail.sDate"
                                 formControlName="sDate">
@@ -432,34 +432,6 @@
                                 กรุณากรอกวันที่เริ่มต้นการเบิก.
                             </div>
                         </div>
-                        <div class="col-6 mb-1">
-                            <label for="exampleFormControlSelect1">วันที่สิ้นสุด</label>
-                            <input type="date" class="form-control" value="" [(ngModel)]="modelItemDetail.eDate"
-                                formControlName="eDate">
-                            <div style="color: red;" *ngIf="myFormEquir.controls.eDate.status=='INVALID'">
-                                กรุณากรอกวันที่สิ้นสุดการเบิก.
-                            </div>
-                        </div>
-                    </div>
-                    <div class="row">
-                        <div class="col-6 mb-1">
-                            <label for="exampleFormControlSelect1">เวลาที่เริ่มต้น</label>
-                            <input class="form-control" type="time" [(ngModel)]="modelItemDetail.sTime"
-                                formControlName="sTime" />
-
-                            <div style="color: red;" *ngIf="myFormEquir.controls.sTime.status=='INVALID'">
-                                กรุณากรอกเวลาที่เริ่มต้นการเบิก.
-                            </div>
-                        </div>
-                        <div class="col-6 mb-1">
-                            <label for="exampleFormControlSelect1">เวลาที่สิ้นสุด</label>
-                            <input class="form-control" type="time" [(ngModel)]="modelItemDetail.eTime"
-                                formControlName="eTime" />
-
-                            <div style="color: red;" *ngIf="myFormEquir.controls.eTime.status=='INVALID'">
-                                กรุณากรอกเวลาที่สิ้นสุดการเบิก.
-                            </div>
-                        </div>
                     </div>
                     <div class=" row">
                         <div class=" col-sm-6 mb-1">
@@ -485,7 +457,7 @@
             </div>
             <div class=" card-footer">
                 <button class=" btn btn-fill btn-danger" type="submit" (click)="saveLend()">Save</button>
-                <button class=" btn btn-fill btn-danger" type="close">Cancel</button>
+                <button class=" btn btn-fill btn-danger" type="cancel" (click)="modal.dismiss('Cross click')">Cancel</button>
             </div>
         </div>
     </div>

src/app/service/item-detail.service.ts

@@ -27,7 +27,8 @@ export class ItemDetailService {
       eTelephone: '0123456789',
       email: 'qwerty@qwerty',
       remark: 'test',
-      allDay: false
+      allDay: false,
+      returnItem: true
     },
     {
       id : 2,
@@ -48,7 +49,8 @@ export class ItemDetailService {
       eTelephone: '0123456789',
       email: 'qwerty@qwerty',
       remark: 'test',
-      allDay: false
+      allDay: false,
+      returnItem: true
     },
 
   ]