Commit c2ed17fe by DESKTOP-E0VCCBD\zedan

update

parent c624d2bc
...@@ -26,7 +26,6 @@ class ProjectEquipment(Base): ...@@ -26,7 +26,6 @@ class ProjectEquipment(Base):
) )
quantity_in_project = Column(Integer, nullable=False, default=0) quantity_in_project = Column(Integer, nullable=False, default=0)
low_stock_threshold = Column(Integer, nullable=False, default=5)
# Relationship กลับไปยัง Project และ Equipment # Relationship กลับไปยัง Project และ Equipment
project = relationship("Project", back_populates="project_equipment", lazy="joined") project = relationship("Project", back_populates="project_equipment", lazy="joined")
......
...@@ -21,40 +21,6 @@ ...@@ -21,40 +21,6 @@
<label for="endDate" class="whitespace-nowrap">End Date:</label> <label for="endDate" class="whitespace-nowrap">End Date:</label>
<input type="date" [(ngModel)]="endDate" id="endDate" name="endDate" class="border rounded px-2 py-1" /> <input type="date" [(ngModel)]="endDate" id="endDate" name="endDate" class="border rounded px-2 py-1" />
</div> </div>
<!-- Dropdown Checkbox -->
<div class="relative inline-block" (clickOutside)="isDropdownOpen = false">
<!-- Dropdown button -->
<button (click)="toggleDropdown()" class="border rounded px-4 py-2 bg-white shadow w-48 text-left">
{{ getSelectedLabel() }}
</button>
<!-- Dropdown content -->
<div *ngIf="isDropdownOpen" class="absolute z-10 mt-1 w-48 bg-white border rounded shadow">
<label *ngFor="let project of projectList" class="flex items-center px-4 py-2 hover:bg-gray-100">
<input type="checkbox" [value]="project" [(ngModel)]="projectSelection[project.project_name]"
class="mr-2" />
{{ project.project_name }}
</label>
</div>
</div>
<!-- Dropdown Checkbox -->
<div class="relative inline-block" (clickOutside)="isDropdownOpen1 = false">
<!-- Dropdown button -->
<button (click)="toggleDropdown1()" class="border rounded px-4 py-2 bg-white shadow w-48 text-left">
{{ getSelected() }}
</button>
<!-- Dropdown content -->
<div *ngIf="isDropdownOpen1" class="absolute z-10 mt-1 w-48 bg-white border rounded shadow">
<label *ngFor="let item of equipmentList" class="flex items-center px-4 py-2 hover:bg-gray-100">
<input type="checkbox" [value]="item" [(ngModel)]=" itemSelection [item.equipmentName]" class="mr-2" />
{{ item.equipmentName }}
</label>
</div>
</div>
<div class="flex flex-wrap gap-2"> <div class="flex flex-wrap gap-2">
<a href="javascript:void(0);" class="hs-dropdown-toggle ti-btn ti-btn-primary-full me-2" <a href="javascript:void(0);" class="hs-dropdown-toggle ti-btn ti-btn-primary-full me-2"
(click)="getDashbord()" data-hs-overlay="#modal-detail"><i class="font-semibold align-middle"></i>Apply (click)="getDashbord()" data-hs-overlay="#modal-detail"><i class="font-semibold align-middle"></i>Apply
......
...@@ -365,21 +365,6 @@ export class HomeCommonComponent { ...@@ -365,21 +365,6 @@ export class HomeCommonComponent {
} }
getSelectedLabel(): string {
const selectedIds = Object.keys(this.projectSelection).filter(
id => this.projectSelection[id]
);
if (selectedIds.length === 0) return 'เลือกโปรเจค';
if (selectedIds.length === this.projectList.length) return 'โปรเจคทั้งหมด';
// ดึงชื่อจริงจาก projectList
const selectedNames = this.projectList
.filter(project => selectedIds.includes(project.project_name))
.map(project => project.project_name);
return selectedNames.join(', ');
}
getSelected(): string { getSelected(): string {
const selectedIds = Object.keys(this.itemSelection).filter( const selectedIds = Object.keys(this.itemSelection).filter(
......
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