Skip to content

B
BookingMyHrManagement
Commit 16d9fa3e by DESKTOP-HF0LVOG\myhr
Options

Update หน้าต่างการเบิกอุปกรณ์และตารางรายการแสดงสถานะ

parent 3b3c8056
Showing with 274 additions and 164 deletions
src/app/models/equirment.model.ts
import { CategoryModel } from "./itemDetail.model";
export class Equirment { export class Equirment {
eqId: number; eqId: number;
eqName: string; eqName: string;
...@@ -15,19 +17,19 @@ export class Equirment { ...@@ -15,19 +17,19 @@ export class Equirment {
} }
export interface SearchEquirmentModel { export interface SearchEquirmentModel {
sdate: string; sDate: string;
edate: string; eDate: string;
stime: string; sTime: string;
etime: string; eTime: string;
} }
export class SearchEquirmentModel { export class SearchEquirmentModel {
constructor(init?: SearchEquirmentModel) { constructor(init?: SearchEquirmentModel) {
Object.assign(this, init); Object.assign(this, init);
this.sdate = '', this.sDate = '',
this.edate = '', this.eDate = '',
this.stime = '', this.sTime = '',
this.etime = ''; this.eTime = '';
} }
} }
......
src/app/models/itemDetail.model.ts
interface itemDetail { import { Equirment } from "./equirment.model";
id?: number;
catagory: string; export class itemDetail {
type: string; Id?: number;
detail: string; equirment : Equirment;
name: string; userName: string;
sdate: string; sDate: string;
edate: string; eDate: string;
stime: string; sTime: {
etime: string; hour: number;
status: string; minute: number;
quantity: string; second: number;
remark: string; };
eTime: {
hour: number;
minute: number;
second: number;
};
eStatus: string;
Quantity: string;
Remark: string;
constructor(init?: itemDetail) {
Object.assign(this, init);
this.Id = 1;
this.equirment = this.equirment;
this.userName = '';
this.sDate = '';
this.eDate = '';
this.eStatus = '';
this.Quantity = '';
this.Remark = '';
}
}
export interface SearchitemDetailModel {
sDate: string;
eDate: string;
sTime: string;
eTime: string;
}
export class SearchitemDetailModel {
constructor(init?: SearchitemDetailModel) {
Object.assign(this, init);
this.sDate = '',
this.eDate = '',
this.sTime = '',
this.eTime = '';
}
} }
interface CategoryModel { export class CategoryModel {
id: number; id: number;
name: string; name: string;
} }
......
src/app/pages/admin-pending/admin-pending.component.ts
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import { NgbDate, NgbCalendar, NgbDateParserFormatter } from '@ng-bootstrap/ng-bootstrap'; import { NgbDate, NgbCalendar, NgbDateParserFormatter } from '@ng-bootstrap/ng-bootstrap';
import { NgbModal, ModalDismissReasons } from '@ng-bootstrap/ng-bootstrap'; import { NgbModal, ModalDismissReasons } from '@ng-bootstrap/ng-bootstrap';
import { itemDetail } from 'src/app/models/itemDetail.model';
@Component({ @Component({
selector: 'app-admin-pending', selector: 'app-admin-pending',
...@@ -40,34 +41,7 @@ export class AdminPendingComponent implements OnInit { ...@@ -40,34 +41,7 @@ export class AdminPendingComponent implements OnInit {
closeResult = ''; closeResult = '';
item: itemDetail[] = [ item: itemDetail[] = [];
{
catagory: 'string',
type: 'string',
detail: 'Moniter',
name: 'a',
sdate: '2021-11-25',
edate: '2021-11-25',
stime: '12.00',
etime: '12.00',
status: 'waiting',
quantity : '1',
remark: '',
},
{
catagory: 'string',
type: 'string',
detail: 'Mouse',
name: 'b',
sdate: '2021-11-25',
edate: '2021-11-25',
stime: '12.00',
etime: '12.00',
status: 'waiting',
quantity : '1',
remark: '',
}
];
collectionSize = this.item.length; collectionSize = this.item.length;
hoveredDate: NgbDate | null = null; hoveredDate: NgbDate | null = null;
......
src/app/pages/equipment/equipment.component.html
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<div class="card-body"> <div class="card-body">
<button class="btn btn-lg btn-outline-primary" <button class="btn btn-lg btn-outline-primary"
(click)="open(contentroom)">เพิ่มรายการ</button> (click)="Ropen(contentroom)">เพิ่มรายการ</button>
<div class="row"> <div class="row">
<div class="col-sm-3" *ngFor="let item of listRoomModel"> <div class="col-sm-3" *ngFor="let item of listRoomModel">
...@@ -38,8 +38,7 @@ ...@@ -38,8 +38,7 @@
<div class="text-center"> <div class="text-center">
<div class="d-grid gap-2 a-md-flex justify-content-md-end "> <div class="d-grid gap-2 a-md-flex justify-content-md-end ">
<button class="btn btn-sm btn-outline-primary" <button class="btn btn-sm btn-outline-primary"
(click)="open(Room)">จอง</button> (click)="Ropen(Room)">จอง</button>
<button class="btn btn-sm btn-primary" type="button">ยกเลิก</button>
</div> </div>
</div> </div>
</div> </div>
...@@ -128,7 +127,7 @@ ...@@ -128,7 +127,7 @@
</ng-template> </ng-template>
<button class="btn btn-lg btn-outline-primary" <button class="btn btn-lg btn-outline-primary"
(click)="open(contentequirment)">เพิ่มรายการ</button> (click)="Eopen(contentequirment)">เพิ่มรายการ</button>
<div class="row"> <div class="row">
<div class="col-sm-3" *ngFor="let item of listEquirmentModel"> <div class="col-sm-3" *ngFor="let item of listEquirmentModel">
...@@ -147,8 +146,7 @@ ...@@ -147,8 +146,7 @@
<div class="text-center"> <div class="text-center">
<div class="d-grid gap-2 a-md-flex justify-content-md-end"> <div class="d-grid gap-2 a-md-flex justify-content-md-end">
<button class="btn btn-sm btn-outline-primary" <button class="btn btn-sm btn-outline-primary"
(click)="open(lend)">เบิก</button> (click)="bookEquir(lend,item)">เบิก</button>
<button class="btn btn-sm btn-primary" type="button">ยกเลิก</button>
</div> </div>
</div> </div>
</div> </div>
...@@ -255,13 +253,13 @@ ...@@ -255,13 +253,13 @@
<div class="row"> <div class="row">
<div class="col-sm-12 mb-1"> <div class="col-sm-12 mb-1">
<label for="exampleFormControlSelect1">ชื่อห้อง</label> <label for="exampleFormControlSelect1">ชื่อห้อง</label>
<input readonly class="form-control" type="text" value="{{item.rName}}"> <input readonly class="form-control" type="text" value="">
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-sm-12 mb-1"> <div class="col-sm-12 mb-1">
<label for="exampleFormControlSelect1">รายละเอียด</label> <label for="exampleFormControlSelect1">รายละเอียด</label>
<input readonly class="form-control" type="text" value="{{item.rDecs}}"> <input readonly class="form-control" type="text" value="">
</div> </div>
</div> </div>
<div class="row"> <div class="row">
...@@ -307,15 +305,15 @@ ...@@ -307,15 +305,15 @@
<div class=" col-md-12"> <div class=" col-md-12">
<div class="card"> <div class="card">
<div class=" card-header"> <div class=" card-header">
<h5 class=" title">Lend Equirment</h5> <h5 class=" title">เบิกอุปกรณ์</h5>
</div> </div>
<div class=" card-body"> <div class=" card-body">
<form> <form>
<div class=" row"> <div class=" row">
<div class=" col-sm-12 mb-1"> <div class=" col-sm-12 mb-1">
<div class=" form-group"> <div class=" form-group">
<label> ชื่อผู้จอง </label> <label> ชื่อผู้เบิก </label>
<input class=" form-control" placeholder="" type="text" value="" /> <input class=" form-control" placeholder="" type="text" value="" [(ngModel)]="modelitemDetail.userName"/>
</div> </div>
</div> </div>
</div> </div>
...@@ -330,40 +328,40 @@ ...@@ -330,40 +328,40 @@
<div class="row"> <div class="row">
<div class="col-sm-12 mb-1"> <div class="col-sm-12 mb-1">
<label for="exampleFormControlSelect1">ชื่ออุปกรณ์</label> <label for="exampleFormControlSelect1">ชื่ออุปกรณ์</label>
<input readonly class="form-control" type="text" value="{{item.rName}}"> <input readonly class="form-control" type="text" [value]="modelitemDetail.equirment.eqName" >
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-sm-12 mb-1"> <div class="col-sm-12 mb-1">
<label for="exampleFormControlSelect1">รายละเอียดอุปกรณ์</label> <label for="exampleFormControlSelect1">รายละเอียดอุปกรณ์</label>
<input readonly class="form-control" type="text" value="{{item.rDecs}}"> <input readonly class="form-control" type="text" [value]="modelitemDetail.equirment.eqDesc">
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-6 mb-1"> <div class="col-6 mb-1">
<label for="exampleFormControlSelect1">วันที่เริ่มต้น</label> <label for="exampleFormControlSelect1">วันที่เริ่มต้น</label>
<input type="date" class="form-control" value=""> <input type="date" class="form-control" value="" [(ngModel)]="modelitemDetail.sDate">
</div> </div>
<div class="col-6 mb-1"> <div class="col-6 mb-1">
<label for="exampleFormControlSelect1">วันที่สิ้นสุด</label> <label for="exampleFormControlSelect1">วันที่สิ้นสุด</label>
<input type="date" class="form-control" value=""> <input type="date" class="form-control" value="" [(ngModel)]="modelitemDetail.eDate">
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-6 mb-1"> <div class="col-6 mb-1">
<label for="exampleFormControlSelect1">เวลาที่เริ่มต้น</label> <label for="exampleFormControlSelect1">เวลาที่เริ่มต้น</label>
<ngb-timepicker [(ngModel)]="stime"></ngb-timepicker> <ngb-timepicker [(ngModel)]="modelitemDetail.sTime"></ngb-timepicker>
</div> </div>
<div class="col-6 mb-1"> <div class="col-6 mb-1">
<label for="exampleFormControlSelect1">เวลาที่สิ้นสุด</label> <label for="exampleFormControlSelect1">เวลาที่สิ้นสุด</label>
<ngb-timepicker [(ngModel)]="etime"></ngb-timepicker> <ngb-timepicker [(ngModel)]="modelitemDetail.eTime"></ngb-timepicker>
</div> </div>
</div> </div>
<div class=" row"> <div class=" row">
<div class=" col-sm-6 mb-1"> <div class=" col-sm-6 mb-1">
<label for="changequantity">จำนวน</label> <label for="changequantity">จำนวน</label>
<input id="changequantity" type="number" class="form-control form-control-sm" <input id="changequantity" type="number" class="form-control form-control-sm"
[(ngModel)]="quantity" /> [(ngModel)]="modelitemDetail.Quantity" />
</div> </div>
</div> </div>
<div class=" row"> <div class=" row">
...@@ -371,14 +369,14 @@ ...@@ -371,14 +369,14 @@
<div class=" form-group"> <div class=" form-group">
<label> หมายเหตุ </label> <label> หมายเหตุ </label>
<textarea class="form-control" id="exampleFormControlTextarea1" rows="3" <textarea class="form-control" id="exampleFormControlTextarea1" rows="3"
placeholder="......"></textarea> placeholder="......" [(ngModel)]="modelitemDetail.Remark"></textarea>
</div> </div>
</div> </div>
</div> </div>
</form> </form>
</div> </div>
<div class=" card-footer"> <div class=" card-footer">
<button class=" btn btn-fill btn-danger" type="submit">Save</button> <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="close">Cancel</button>
</div> </div>
</div> </div>
......
src/app/pages/equipment/equipment.component.ts
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import { NgbModal, ModalDismissReasons } from '@ng-bootstrap/ng-bootstrap'; import { NgbModal, ModalDismissReasons } from '@ng-bootstrap/ng-bootstrap';
import { Equirment } from 'src/app/models/equirment.model'; import { Equirment } from 'src/app/models/equirment.model';
import { itemDetail } from 'src/app/models/itemDetail.model';
import { Room } from 'src/app/models/rooms.model'; import { Room } from 'src/app/models/rooms.model';
import { EquirmentService } from 'src/app/service/equirment.service'; import { EquirmentService } from 'src/app/service/equirment.service';
import { itemDetailService } from 'src/app/service/item-detail.service';
import { RoomService } from 'src/app/service/room.service'; import { RoomService } from 'src/app/service/room.service';
...@@ -21,9 +23,12 @@ export class EquipmentComponent implements OnInit { ...@@ -21,9 +23,12 @@ export class EquipmentComponent implements OnInit {
listEquirmentModel: Equirment[] = []; listEquirmentModel: Equirment[] = [];
listRoomModel: Room[] = []; listRoomModel: Room[] = [];
collectionSize = this.listEquirmentModel.length; collectionSize = this.listEquirmentModel.length;
modelEquirment = new Equirment(); modelEquirment = new Equirment();
modelRoom = new Room(); modelRoom = new Room();
constructor(private modalService: NgbModal, private equirmentService: EquirmentService, private roomService: RoomService) { modelitemDetail = new itemDetail();
constructor(private modalService: NgbModal, private equirmentService: EquirmentService, private roomService: RoomService, private itemDetailService : itemDetailService) {
} }
...@@ -32,6 +37,7 @@ export class EquipmentComponent implements OnInit { ...@@ -32,6 +37,7 @@ export class EquipmentComponent implements OnInit {
this.listRoomModel = this.roomService.getListRoom(); this.listRoomModel = this.roomService.getListRoom();
} }
Eopen(contentequirment) { Eopen(contentequirment) {
this.modelEquirment = new Equirment(); this.modelEquirment = new Equirment();
this.modalService.open(contentequirment, { ariaLabelledBy: 'modal-basic-title' }).result.then((result) => { this.modalService.open(contentequirment, { ariaLabelledBy: 'modal-basic-title' }).result.then((result) => {
...@@ -41,6 +47,20 @@ export class EquipmentComponent implements OnInit { ...@@ -41,6 +47,20 @@ export class EquipmentComponent implements OnInit {
}); });
} }
book(contentequirment,item : Equirment) {
this.modelitemDetail = new itemDetail();
this.modelitemDetail.equirment = item ;
console.log("item",this.modelitemDetail);
this.modalService.open(contentequirment, { ariaLabelledBy: 'modal-basic-title' }).result.then((result) => {
this.closeResult = `Closed with: ${result}`;
}, (reason) => {
this.closeResult = `Dismissed ${this.getDismissReason(reason)}`;
});
}
Ropen(contentroom) { Ropen(contentroom) {
this.modelRoom = new Room(); this.modelRoom = new Room();
this.modalService.open(contentroom, { ariaLabelledBy: 'modal-basic-title' }).result.then((result) => { this.modalService.open(contentroom, { ariaLabelledBy: 'modal-basic-title' }).result.then((result) => {
...@@ -86,5 +106,12 @@ export class EquipmentComponent implements OnInit { ...@@ -86,5 +106,12 @@ export class EquipmentComponent implements OnInit {
this.ngOnInit(); this.ngOnInit();
} }
saveLend() {
this.itemDetailService.additemDetail(this.modelitemDetail);
this.modalService.dismissAll();
this.ngOnInit();
console.log(this.itemDetailService);
}
} }
src/app/pages/lend-page/lend-page.component.ts
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import { itemDetail } from 'src/app/models/itemDetail.model';
@Component({ @Component({
selector: 'app-lend-page', selector: 'app-lend-page',
...@@ -7,36 +8,7 @@ import { Component, OnInit } from '@angular/core'; ...@@ -7,36 +8,7 @@ import { Component, OnInit } from '@angular/core';
}) })
export class LendPageComponent implements OnInit { export class LendPageComponent implements OnInit {
item: itemDetail[] = [ item: itemDetail[] = [];
{
catagory: 'string',
type: 'string',
detail: 'Moniter',
name: 'a',
sdate: '2021-11-25',
edate: '2021-11-25',
stime: '12.00',
etime: '12.00',
status: 'waiting',
quantity : '1',
remark: '',
},
{
catagory: 'string',
type: 'string',
detail: 'Mouse',
name: 'b',
sdate: '2021-11-25',
edate: '2021-11-25',
stime: '12.00',
etime: '12.00',
status: 'waiting',
quantity : '1',
remark: '',
}
];
collectionSize = this.item.length; collectionSize = this.item.length;
constructor() { } constructor() { }
......
src/app/pages/pending/pending.component.html
...@@ -77,24 +77,24 @@ ...@@ -77,24 +77,24 @@
<tr> <tr>
<th scope="col">#</th> <th scope="col">#</th>
<th scope="col">หมวดหมู่</th> <th scope="col">หมวดหมู่</th>
<th scope="col">ประเภท</th> <th scope="col">ชื่ออุปกรณ์</th>
<th scope="col">รายละเอียด</th> <th scope="col">รายละเอียด</th>
<th scope="col">ชื่อ</th> <th scope="col">ชื่อผู้เบิก</th>
<th scope="col">วันที่เริ่มต้น</th> <th scope="col">วันที่เริ่มต้น</th>
<th scope="col">วันที่สิ้นสุด</th> <th scope="col">วันที่สิ้นสุด</th>
<th scope="col">สถานะ</th> <th scope="col">สถานะ</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr *ngFor="let country of countries"> <tr *ngFor="let item of listitemDetail">
<th scope="row">{{ country.id }}</th> <th scope="row">{{ item.Id }}</th>
<td>{{ country.catagory }}</td> <td>{{ item.equirment.eqType }}</td>
<td>{{ country.type }}</td> <td>{{ item.equirment.eqName }}</td>
<td>{{ country.detail }}</td> <td>{{ item.equirment.eqDesc }}</td>
<td>{{ country.name }}</td> <td>{{ item.userName }}</td>
<td>{{ country.sdate | date:'dd-MM-yyyy' }} {{ country.stime }}</td> <td>{{ item.sDate | date:'dd-MM-yyyy' }} {{ item.sTime.hour }}:{{ item.sTime.minute }}</td>
<td>{{ country.edate | date:'dd-MM-yyyy' }} {{ country.etime }}</td> <td>{{ item.eDate | date:'dd-MM-yyyy' }} {{ item.eTime.hour }}:{{ item.eTime.minute }}</td>
<td>{{ country.status }}</td> <td>{{ item.eStatus }}</td>
<div class="col-auto align-self-sm-center"> <div class="col-auto align-self-sm-center">
<button type="button" class="btn btn-info btn-sm btn-circle " <button type="button" class="btn btn-info btn-sm btn-circle "
style="line-height: 0px" (click)="open(Room)"><i class="fa fa-search"></i> </button> style="line-height: 0px" (click)="open(Room)"><i class="fa fa-search"></i> </button>
...@@ -144,16 +144,15 @@ ...@@ -144,16 +144,15 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr *ngFor="let country of countries"> <tr *ngFor="let item of listitemDetail">
<th scope="row">{{ country.id }}</th> <th scope="row">{{ item.Id }}</th>
<td>{{ country.catagory }}</td> <td>{{ item.Catagory }}</td>
<td>{{ country.type }}</td> <td>{{ item.Type }}</td>
<td>{{ country.detail }}</td> <td>{{ item.Detail }}</td>
<td>{{ country.name }}</td> <td>{{ item.userName }}</td>
<td>{{ country.sdate | date:'dd-MM-yyyy' }} {{ country.stime }}</td> <td>{{ item.sDate | date:'dd-MM-yyyy' }} {{ item.sTime.hour }}:{{ item.sTime.minute }}</td>
<td>{{ country.edate | date:'dd-MM-yyyy' }} {{ country.etime }}</td> <td>{{ item.eDate | date:'dd-MM-yyyy' }} {{ item.eTime.hour }}:{{ item.eTime.minute }}</td>
<td>{{ country.quantity }}</td> <td>{{ item.eStatus }}</td>
<td>{{ country.status }}</td>
<div class="col-auto align-self-sm-center"> <div class="col-auto align-self-sm-center">
<button type="button" class="btn btn-info btn-sm btn-circle " <button type="button" class="btn btn-info btn-sm btn-circle "
style="line-height: 0px" (click)="open(lend)"><i class="fa fa-search"></i> </button> style="line-height: 0px" (click)="open(lend)"><i class="fa fa-search"></i> </button>
...@@ -211,13 +210,13 @@ ...@@ -211,13 +210,13 @@
<div class="row"> <div class="row">
<div class="col-sm-12 mb-1"> <div class="col-sm-12 mb-1">
<label for="exampleFormControlSelect1">ชื่อห้อง</label> <label for="exampleFormControlSelect1">ชื่อห้อง</label>
<input readonly class="form-control" type="text" value="{{item.rname}}"> <input readonly class="form-control" type="text" value="">
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-sm-12 mb-1"> <div class="col-sm-12 mb-1">
<label for="exampleFormControlSelect1">รายละเอียด</label> <label for="exampleFormControlSelect1">รายละเอียด</label>
<input readonly class="form-control" type="text" value="{{item.rdecs}}"> <input readonly class="form-control" type="text" value="">
</div> </div>
</div> </div>
<div class="row"> <div class="row">
...@@ -233,11 +232,11 @@ ...@@ -233,11 +232,11 @@
<div class="row"> <div class="row">
<div class="col-6 mb-1"> <div class="col-6 mb-1">
<label for="exampleFormControlSelect1">เวลาที่เริ่มต้น</label> <label for="exampleFormControlSelect1">เวลาที่เริ่มต้น</label>
<input readonly class="form-control" type="text" value="{{country.stime}}"> <input readonly class="form-control" type="text" value="">
</div> </div>
<div class="col-6 mb-1"> <div class="col-6 mb-1">
<label [readonly] for="exampleFormControlSelect1">เวลาที่สิ้นสุด</label> <label [readonly] for="exampleFormControlSelect1">เวลาที่สิ้นสุด</label>
<input readonly class="form-control" type="text" value="{{country.etime}}"> <input readonly class="form-control" type="text" value="">
</div> </div>
</div> </div>
<div class=" row"> <div class=" row">
...@@ -282,13 +281,13 @@ ...@@ -282,13 +281,13 @@
<div class="row"> <div class="row">
<div class="col-sm-12 mb-1"> <div class="col-sm-12 mb-1">
<label for="exampleFormControlSelect1">ชื่ออุปกรณ์</label> <label for="exampleFormControlSelect1">ชื่ออุปกรณ์</label>
<input readonly class="form-control" type="text" value="{{item.rname}}"> <input readonly class="form-control" type="text" value="">
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-sm-12 mb-1"> <div class="col-sm-12 mb-1">
<label for="exampleFormControlSelect1">รายละเอียดอุปกรณ์</label> <label for="exampleFormControlSelect1">รายละเอียดอุปกรณ์</label>
<input readonly class="form-control" type="text" value="{{item.rdecs}}"> <input readonly class="form-control" type="text" value="">
</div> </div>
</div> </div>
<div class="row"> <div class="row">
...@@ -304,11 +303,11 @@ ...@@ -304,11 +303,11 @@
<div class="row"> <div class="row">
<div class="col-6 mb-1"> <div class="col-6 mb-1">
<label for="exampleFormControlSelect1">เวลาที่เริ่มต้น</label> <label for="exampleFormControlSelect1">เวลาที่เริ่มต้น</label>
<input readonly class="form-control" type="text" value="{{country.stime}}"> <input readonly class="form-control" type="text" value="">
</div> </div>
<div class="col-6 mb-1"> <div class="col-6 mb-1">
<label for="exampleFormControlSelect1">เวลาที่สิ้นสุด</label> <label for="exampleFormControlSelect1">เวลาที่สิ้นสุด</label>
<input readonly class="form-control" type="text" value="{{country.etime}}"> <input readonly class="form-control" type="text" value="">
</div> </div>
</div> </div>
<div class=" row"> <div class=" row">
......
src/app/pages/pending/pending.component.ts
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import { NgbDate, NgbCalendar, NgbDateParserFormatter } from '@ng-bootstrap/ng-bootstrap'; import { NgbDate, NgbCalendar, NgbDateParserFormatter } from '@ng-bootstrap/ng-bootstrap';
import { NgbModal, ModalDismissReasons } from '@ng-bootstrap/ng-bootstrap'; import { NgbModal, ModalDismissReasons } from '@ng-bootstrap/ng-bootstrap';
import { itemDetail } from 'src/app/models/itemDetail.model';
import { itemDetailService } from 'src/app/service/item-detail.service';
@Component({ @Component({
selector: 'app-pending', selector: 'app-pending',
...@@ -39,48 +41,22 @@ export class PendingComponent implements OnInit { ...@@ -39,48 +41,22 @@ export class PendingComponent implements OnInit {
closeResult = ''; closeResult = '';
item : itemDetail[] = [ listitemDetail : itemDetail[] = [];
{
catagory: 'string', collectionSize = this.listitemDetail.length;
type: 'string',
detail: 'Moniter',
name: 'a',
sdate: '2021-11-25',
edate: '2021-11-25',
stime: '12.00',
etime: '12.00',
status: 'waiting',
quantity : '1',
remark: '',
},
{
catagory: 'string',
type: 'string',
detail: 'Mouse',
name: 'b',
sdate: '2021-11-25',
edate: '2021-11-25',
stime: '12.00',
etime: '12.00',
status: 'waiting',
quantity : '1',
remark: '',
}
];
collectionSize = this.item.length;
hoveredDate: NgbDate | null = null; hoveredDate: NgbDate | null = null;
fromDate: NgbDate | null; fromDate: NgbDate | null;
toDate: NgbDate | null; toDate: NgbDate | null;
constructor(private calendar: NgbCalendar, public formatter: NgbDateParserFormatter , private modalService: NgbModal) { constructor(private calendar: NgbCalendar, public formatter: NgbDateParserFormatter, private modalService: NgbModal, private itemDetailService: itemDetailService) {
this.fromDate = calendar.getToday(); this.fromDate = calendar.getToday();
this.toDate = calendar.getNext(calendar.getToday(), 'd', 10); this.toDate = calendar.getNext(calendar.getToday(), 'd', 10);
this.refreshitemDetail(); this.refreshitemDetail();
} }
refreshitemDetail() { refreshitemDetail() {
this.item = this.item this.listitemDetail = this.listitemDetail
.map((item, i) => ({ id: i + 1, ...item })) .map((item, i) => ({ id: i + 1, ...item }))
.slice((this.page - 1) * this.pageSize, (this.page - 1) * this.pageSize + this.pageSize); .slice((this.page - 1) * this.pageSize, (this.page - 1) * this.pageSize + this.pageSize);
} }
...@@ -131,7 +107,9 @@ export class PendingComponent implements OnInit { ...@@ -131,7 +107,9 @@ export class PendingComponent implements OnInit {
return parsed && this.calendar.isValid(NgbDate.from(parsed)) ? NgbDate.from(parsed) : currentValue; return parsed && this.calendar.isValid(NgbDate.from(parsed)) ? NgbDate.from(parsed) : currentValue;
} }
ngOnInit(): void { ngOnInit() {
this.listitemDetail = this.itemDetailService.getListitemDetail();
console.log(this.listitemDetail);
} }
} }
......
src/app/service/equirment.service.ts
...@@ -58,7 +58,7 @@ export class EquirmentService { ...@@ -58,7 +58,7 @@ export class EquirmentService {
} }
searchListEquirment(searchModel: SearchEquirmentModel) { searchListEquirment(searchModel: SearchEquirmentModel) {
this.http.get(this.url + '&startDate=' + searchModel.sdate.split("-")[2] + '-' + searchModel.sdate.split("-")[1] + '-' + searchModel.sdate.split("-")[0] + '&endDate=' + searchModel.edate.split("-")[2] + '-' + searchModel.edate.split("-")[1] + '-' + searchModel.edate.split("-")[0] + '&startTime=' + searchModel.stime + ':00' + '&endTime=' + searchModel.etime + ':00').subscribe((response: any) => { this.http.get(this.url + '&startDate=' + searchModel.sDate.split("-")[2] + '-' + searchModel.sDate.split("-")[1] + '-' + searchModel.sDate.split("-")[0] + '&endDate=' + searchModel.eDate.split("-")[2] + '-' + searchModel.eDate.split("-")[1] + '-' + searchModel.eDate.split("-")[0] + '&startTime=' + searchModel.sTime + ':00' + '&endTime=' + searchModel.eTime + ':00').subscribe((response: any) => {
console.log(response); console.log(response);
this.listEquirment = response; this.listEquirment = response;
}, error => { }, error => {
......
src/app/service/item-detail.service.ts 0 → 100644
import { Injectable } from '@angular/core';
import { HttpClient, HttpHeaders } from '@angular/common/http';
import { itemDetail, SearchitemDetailModel } from '../models/itemDetail.model';
@Injectable({ providedIn: 'root' })
export class itemDetailService {
constructor(private http: HttpClient) { }
url: string;
listitemDetail: itemDetail[] = [
{
Id : 1,
equirment : {
eqId: 2,
eqName: "เมาส์",
eqDesc: "...",
eqType: "it",
eqPic: "assets/img/mou.jpg"
},
userName: 'เกม',
sDate: '10/12/2560',
eDate: '10/11/2561',
sTime: {
hour: 22,
minute: 30,
second: 0
},
eTime: {
hour: 22,
minute: 30,
second: 0
},
eStatus: 'รอการอนุมัติ',
Quantity: '1',
Remark: 'test',
},
{
Id : 2,
equirment : {
eqId: 3,
eqName: "โน๊ตบุ๊ค",
eqDesc: "หน้าจอขนาด 20 นิ้ว",
eqType: "it",
eqPic: "assets/img/notebook.jpg"
},
userName: 'แป๊ะ',
sDate: '',
eDate: '',
sTime: {
hour: 22,
minute: 30,
second: 0
},
eTime: {
hour: 22,
minute: 30,
second: 0
},
eStatus: 'รอการอนุมัติ',
Quantity: '1',
Remark: 'test',
},
]
additemDetail(model: itemDetail) {
console.log(this.listitemDetail);
this.listitemDetail.push(model);
}
getListitemDetail() {
return this.listitemDetail;
}
// getListitemDetail() {
// this.http.get(this.url).subscribe((response: any) => {
// console.log(response);
// this.listitemDetail = response.content;
// }, error => {
// console.log(error)
// // alert("ไม่สามารถดึงข้อมูลห้องประชุมได้ เนื่องจาก :\n" + error.message)
// })
// }
searchListitemDetail(searchModel: SearchitemDetailModel) {
this.http.get(this.url + '&startDate=' + searchModel.sDate.split("-")[2] + '-' + searchModel.sDate.split("-")[1] + '-' + searchModel.sDate.split("-")[0] + '&endDate=' + searchModel.eDate.split("-")[2] + '-' + searchModel.eDate.split("-")[1] + '-' + searchModel.eDate.split("-")[0] + '&startTime=' + searchModel.sTime + ':00' + '&endTime=' + searchModel.eTime + ':00').subscribe((response: any) => {
console.log(response);
this.listitemDetail = response;
}, error => {
console.log(error)
alert("ไม่สามารถค้นหาอุปกรณ์ที่ว่างได้ เนื่องจาก :\n" + error.message)
})
}
// addEquirment(EquirmentModel: Equirment) {
// this.http.post(this.url, EquirmentModel).subscribe(response => {
// console.log(response);
// })
// }
deleteitemDetail(itemDetailModel: itemDetail) {
this.http.delete(this.url + "/" + itemDetailModel.Id).subscribe(response => {
console.log(response);
this.getListitemDetail()
alert("ลบข้อมูลอุปกรณ์สำเร็จ")
})
}
updateitemDetail(itemDetailModel: itemDetail) {
this.http.put(this.url + "/" +itemDetailModel.Id, itemDetailModel).subscribe(response => {
console.log(response);
alert("อัพเดทข้อมูลอุปกรณ์สำเร็จ")
})
}
itemDetailModel(eqId: string) {
}
}
\ No newline at end of file
src/app/service/room.service.ts
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { HttpClient, HttpHeaders } from '@angular/common/http'; import { HttpClient, HttpHeaders } from '@angular/common/http';
import { Room, SearchRoomModel } from '../models/rooms.model'; import { Room, SearchRoomModel } from '../models/rooms.model';
import { itemDetail } from '../models/itemDetail.model';
@Injectable({ providedIn: 'root' }) @Injectable({ providedIn: 'root' })
...@@ -46,7 +47,6 @@ export class RoomService { ...@@ -46,7 +47,6 @@ export class RoomService {
addRoom(model: Room) { addRoom(model: Room) {
this.listRoomModel.push(model); this.listRoomModel.push(model);
} }
getListRoom() { getListRoom() {
......
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