From 9f351b7c4fce9a9d2975895caa3b3b60e013ec85 Mon Sep 17 00:00:00 2001 From: DESKTOP-HF0LVOG\myhr <teetacg@csc.co.th> Date: Mon, 29 Nov 2021 11:08:57 +0700 Subject: [PATCH] Revert "Add หน้าต่างดำเนินการ" This reverts commit 32cfcb9f927d7ad6224bcc7458bf954b05d6678e. --- src/app/app.module.ts | 3 +-- src/app/components/sidebar/sidebar.component.ts | 7 ------- src/app/layouts/admin-layout/admin-layout.routing.ts | 2 -- src/app/models/items.model.ts | 31 ------------------------------- src/app/models/transection.model.ts | 6 ------ src/app/pages/equipment/equipment.component.html | 80 +++++--------------------------------------------------------------------------- src/app/pages/equipment/equipment.component.ts | 37 ++++++++++++++++++------------------- src/app/pages/lend-page/lend-page.component.html | 46 ---------------------------------------------- src/app/pages/lend-page/lend-page.component.scss | 0 src/app/pages/lend-page/lend-page.component.spec.ts | 25 ------------------------- src/app/pages/lend-page/lend-page.component.ts | 41 ----------------------------------------- src/app/pages/pending/pending.component.ts | 13 +++++++++++-- 12 files changed, 35 insertions(+), 256 deletions(-) delete mode 100644 src/app/models/items.model.ts delete mode 100644 src/app/models/transection.model.ts delete mode 100644 src/app/pages/lend-page/lend-page.component.html delete mode 100644 src/app/pages/lend-page/lend-page.component.scss delete mode 100644 src/app/pages/lend-page/lend-page.component.spec.ts delete mode 100644 src/app/pages/lend-page/lend-page.component.ts diff --git a/src/app/app.module.ts b/src/app/app.module.ts index f3e5a57..45f1671 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -21,7 +21,6 @@ import { EquipmentComponent } from "./pages/equipment/equipment.component"; import { CalenRoomComponent } from './pages/calen-room/calen-room.component'; import { AdminPendingComponent } from './pages/admin-pending/admin-pending.component'; import { PendingComponent } from './pages/pending/pending.component'; -import { LendPageComponent } from './pages/lend-page/lend-page.component'; FullCalendarModule.registerPlugins([ // register FullCalendar plugins dayGridPlugin, @@ -40,7 +39,7 @@ FullCalendarModule.registerPlugins([ // register FullCalendar plugins ToastrModule.forRoot(), FullCalendarModule, ], - declarations: [AppComponent, AdminLayoutComponent, AuthLayoutComponent, HomePageComponent, EquipmentComponent, CalenRoomComponent, AdminPendingComponent, PendingComponent, LendPageComponent], + declarations: [AppComponent, AdminLayoutComponent, AuthLayoutComponent, HomePageComponent, EquipmentComponent, CalenRoomComponent, AdminPendingComponent, PendingComponent], providers: [], bootstrap: [AppComponent] }) diff --git a/src/app/components/sidebar/sidebar.component.ts b/src/app/components/sidebar/sidebar.component.ts index f0e5319..e779783 100644 --- a/src/app/components/sidebar/sidebar.component.ts +++ b/src/app/components/sidebar/sidebar.component.ts @@ -36,13 +36,6 @@ export const ROUTES: RouteInfo[] = [ icon: "icon-bag-16", class: "" }, - { - path: "/lend-page", - title: "หน้าจอดำเนินการ", - rtlTitle: "", - icon: "icon-bag-16", - class: "" - }, ]; @Component({ diff --git a/src/app/layouts/admin-layout/admin-layout.routing.ts b/src/app/layouts/admin-layout/admin-layout.routing.ts index a4fd462..fce3998 100644 --- a/src/app/layouts/admin-layout/admin-layout.routing.ts +++ b/src/app/layouts/admin-layout/admin-layout.routing.ts @@ -11,7 +11,6 @@ import { HomePageComponent } from "src/app/pages/home-page/home-page.component"; import { EquipmentComponent } from "src/app/pages/equipment/equipment.component"; import { AdminPendingComponent } from "src/app/pages/admin-pending/admin-pending.component"; import { PendingComponent } from "src/app/pages/pending/pending.component"; -import { LendPageComponent } from "src/app/pages/lend-page/lend-page.component"; // import { RtlComponent } from "../../pages/rtl/rtl.component"; export const AdminLayoutRoutes: Routes = [ @@ -19,7 +18,6 @@ export const AdminLayoutRoutes: Routes = [ { path: "equipment", component: EquipmentComponent }, { path: "admin-pending", component: AdminPendingComponent }, { path: "pending", component: PendingComponent }, - { path: "lend-page", component: LendPageComponent }, { path: "dashboard", component: DashboardComponent }, { path: "icons", component: IconsComponent }, { path: "maps", component: MapComponent }, diff --git a/src/app/models/items.model.ts b/src/app/models/items.model.ts deleted file mode 100644 index 0e67cee..0000000 --- a/src/app/models/items.model.ts +++ /dev/null @@ -1,31 +0,0 @@ -interface RoomModel { - rid: number; - rname: string; - rdesc: string; - rpic: string; -} - -interface EquirmentModel { - id: number; - name: string; - desc: string; - type?: CategoryModel; - pic: string; -} - -interface CategoryModel { - id: number; - name: string; -} - -interface Country { - id?: number; - catagory: string; - type: string; - detail: string; - name: string; - sdate: string; - edate: string; - status: string; - quantity: string; -} \ No newline at end of file diff --git a/src/app/models/transection.model.ts b/src/app/models/transection.model.ts deleted file mode 100644 index a857704..0000000 --- a/src/app/models/transection.model.ts +++ /dev/null @@ -1,6 +0,0 @@ -interface TransectionRoom{ - id: number ; - employeeId : string ; - remark : string ; - room : RoomModel; -} \ No newline at end of file diff --git a/src/app/pages/equipment/equipment.component.html b/src/app/pages/equipment/equipment.component.html index a59c04a..90a596a 100644 --- a/src/app/pages/equipment/equipment.component.html +++ b/src/app/pages/equipment/equipment.component.html @@ -1,6 +1,6 @@ <div class="content"> <div class="row"> - <div class="col-8"> + <div class="col-sm-12"> <div class="card"> <div class="card-body"> <div> @@ -9,24 +9,7 @@ </div> </div> </div> - <div class="col-4"> - <div class="card"> - <div class="card-body"> - <div ngbDropdown class="d-inline-block"> - <button class="btn btn-sm btn-outline-primary" id="dropdownBasic1" - ngbDropdownToggle>ประเภทการค้นหา</button> - <div ngbDropdownMenu aria-labelledby="dropdownBasic1"> - <button ngbDropdownItem>ห้อง</button> - <button ngbDropdownItem>รถ</button> - <button ngbDropdownItem>อุปกรณ์สำนักงาน</button> - </div> - <button class="btn btn-sm btn-outline-success" type="submit">Search</button> - </div> - </div> - </div> - </div> </div> - <ul ngbNav #nav="ngbNav" class="nav-tabs"> <li ngbNavItem> <a ngbNavLink>การจอง</a> @@ -72,8 +55,8 @@ <div class=" form-group"> <label> Details </label> <textarea class="form-control" - id="exampleFormControlTextarea1" rows="3" - placeholder="......"></textarea> + id="exampleFormControlTextarea1" + rows="3" placeholder="......"></textarea> </div> </div> </div> @@ -109,59 +92,6 @@ <div class="text-center"> <div class="d-grid gap-2 a-md-flex justify-content-md-end "> <button class="btn btn-sm btn-primary" type="button">ยืม</button> - <ng-template #content let-modal style="padding: 0; "> - <div class=" col-md-12"> - <div class="card"> - <div class=" card-header"> - <h5 class=" title">Add Equirment</h5> - </div> - <div class=" card-body"> - <form> - <div class=" row"> - <div class=" col-md-12"> - <div class=" form-group"> - <label> Name </label> - <input class=" form-control" placeholder="" type="text" - value="" /> - </div> - </div> - </div> - <div class=" row"> - <div class=" col-md-6 mb-2"> - <div class=" form-group"> - <label> Type </label> - <br> - <select class="form-select" - aria-label="Default select example"> - <option selected>Open this select type</option> - <option value="1">Rooms</option> - <option value="2">Cars</option> - </select> - </div> - </div> - </div> - <div class=" row"> - <div class=" col-md-12"> - <div class=" form-group"> - <label> Details </label> - <textarea class="form-control" - id="exampleFormControlTextarea1" rows="3" - placeholder="......"></textarea> - </div> - </div> - </div> - <label for="exampleFormControlFile">แนบไฟล์รูปภาพ</label> - <input type="file" class="form-control-file" - id="exampleFormControlFile"> - </form> - </div> - <div class=" card-footer"> - <button class=" btn btn-fill btn-danger" type="submit">Save</button> - <button class=" btn btn-fill btn-danger" type="cancel">Cancel</button> - </div> - </div> - </div> - </ng-template> <button class="btn btn-sm btn-primary" type="button">ยกเลิก</button> </div> </div> @@ -231,8 +161,8 @@ <div class=" form-group"> <label> Details </label> <textarea class="form-control" - id="exampleFormControlTextarea1" rows="3" - placeholder="......"></textarea> + id="exampleFormControlTextarea1" + rows="3" placeholder="......"></textarea> </div> </div> </div> diff --git a/src/app/pages/equipment/equipment.component.ts b/src/app/pages/equipment/equipment.component.ts index f114830..296344e 100644 --- a/src/app/pages/equipment/equipment.component.ts +++ b/src/app/pages/equipment/equipment.component.ts @@ -1,8 +1,19 @@ import { Component, OnInit } from '@angular/core'; import { NgbModal, ModalDismissReasons } from '@ng-bootstrap/ng-bootstrap'; - - +interface EquirmentModel { + id: number; + name: string; + desc: string; + type: string; + pic: string; +} +interface RoomModel{ + rid : number; + rname : string; + rdesc : string; + rpic : string; +} @Component({ selector: 'app-equipment', @@ -20,44 +31,32 @@ export class EquipmentComponent implements OnInit { id: 1, name: "จอคอมพิวเตอร์", desc: "หน้าจอขนาด 22 นิ้ว", - type: { - id: 1, - name: "it", - }, + type: "it", pic: "assets/img/mo1.jpg" }, { id: 2, name: "เมาส์", desc: "...", - type: { - id: 1, - name: "it", - }, + type: "it", pic: "assets/img/mou.jpg" }, { id: 3, name: "โน๊ตบุ๊ค", desc: "หน้าจอขนาด 20 นิ้ว", - type: { - id: 1, - name: "it", - }, + type: "it", pic: "assets/img/notebook.jpg" }, { id: 4, name: "คีย์บอร์ด", desc: "...", - type: { - id: 1, - name: "it", - }, + type: "it", pic: "assets/img/keyboard.png" } ] - + listRoomModel: RoomModel[] = [ { rid: 1, diff --git a/src/app/pages/lend-page/lend-page.component.html b/src/app/pages/lend-page/lend-page.component.html deleted file mode 100644 index 4b23ccd..0000000 --- a/src/app/pages/lend-page/lend-page.component.html +++ /dev/null @@ -1,46 +0,0 @@ -<div class="content"> - <div class="row"> - <div class="col-sm-12"> - <div class="card"> - <div class="card-body"> - <table class="table table-striped"> - <thead> - <tr> - <th scope="col">#</th> - <th scope="col">Catagory</th> - <th scope="col">Type</th> - <th scope="col">Detail</th> - <th scope="col">Name</th> - <th scope="col">Start-Date</th> - <th scope="col">End-Date</th> - <th scope="col">Quantity</th> - </tr> - </thead> - <tbody> - <tr *ngFor="let country of countries"> - <th scope="row">{{ country.id }}</th> - <td>{{ country.catagory }}</td> - <td>{{ country.type }}</td> - <td>{{ country.detail }}</td> - <td>{{ country.name }}</td> - <td>{{ country.sdate | date:'dd-MM-yyyy' }}</td> - <td>{{ country.edate | date:'dd-MM-yyyy' }}</td> - <td> - <button class="btn btn-primary btn-sm" (click)="_increamentQTY(item.productId._id,1)">+</button> - {{ country.quantity }} - <button class="btn btn-primary btn-sm">-</button> - </td> - </tr> - </tbody> - </table> - <div class="text-center"> - <div class="d-grid gap-2 a-md-flex justify-content-md-end "> - <button class="btn btn-sm btn-primary" type="button">ยืม</button> - <button class="btn btn-sm btn-primary" type="button">ยกเลิก</button> - </div> - </div> - </div> - </div> - </div> - </div> -</div> \ No newline at end of file diff --git a/src/app/pages/lend-page/lend-page.component.scss b/src/app/pages/lend-page/lend-page.component.scss deleted file mode 100644 index e69de29..0000000 --- a/src/app/pages/lend-page/lend-page.component.scss +++ /dev/null diff --git a/src/app/pages/lend-page/lend-page.component.spec.ts b/src/app/pages/lend-page/lend-page.component.spec.ts deleted file mode 100644 index abfa248..0000000 --- a/src/app/pages/lend-page/lend-page.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { LendPageComponent } from './lend-page.component'; - -describe('LendPageComponent', () => { - let component: LendPageComponent; - let fixture: ComponentFixture<LendPageComponent>; - - beforeEach(async () => { - await TestBed.configureTestingModule({ - declarations: [ LendPageComponent ] - }) - .compileComponents(); - }); - - beforeEach(() => { - fixture = TestBed.createComponent(LendPageComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/pages/lend-page/lend-page.component.ts b/src/app/pages/lend-page/lend-page.component.ts deleted file mode 100644 index 9cd39af..0000000 --- a/src/app/pages/lend-page/lend-page.component.ts +++ /dev/null @@ -1,41 +0,0 @@ -import { Component, OnInit } from '@angular/core'; - -@Component({ - selector: 'app-lend-page', - templateUrl: './lend-page.component.html', - styleUrls: ['./lend-page.component.scss'] -}) -export class LendPageComponent implements OnInit { - - countries: Country[] = [ - { - - catagory: 'string', - type: 'string', - detail: 'Moniter', - name: 'a', - sdate: '2021-11-25', - edate: '2021-11-25', - status: 'waiting', - quantity : '1', - }, - { - - catagory: 'string', - type: 'string', - detail: 'Mouse', - name: 'b', - sdate: '2021-11-25', - edate: '2021-11-25', - status: 'waiting', - quantity : '1', - } - ]; - collectionSize = this.countries.length; - - constructor() { } - - ngOnInit(): void { - } - -} diff --git a/src/app/pages/pending/pending.component.ts b/src/app/pages/pending/pending.component.ts index 747e46e..44957ea 100644 --- a/src/app/pages/pending/pending.component.ts +++ b/src/app/pages/pending/pending.component.ts @@ -1,6 +1,17 @@ import { Component, OnInit } from '@angular/core'; import { NgbDate, NgbCalendar, NgbDateParserFormatter } from '@ng-bootstrap/ng-bootstrap'; +interface Country { + id?: number; + catagory: string; + type: string; + detail: string; + name: string; + sdate: string; + edate: string; + status: string; +} + @Component({ selector: 'app-pending', templateUrl: './pending.component.html', @@ -45,7 +56,6 @@ export class PendingComponent implements OnInit { sdate: '2021-11-25', edate: '2021-11-25', status: 'waiting', - quantity : '1', }, { catagory: 'string', @@ -55,7 +65,6 @@ export class PendingComponent implements OnInit { sdate: '2021-11-25', edate: '2021-11-25', status: 'waiting', - quantity : '1', } ]; collectionSize = this.countries.length; -- libgit2 0.26.0