Skip to content

PSManagementUI
PSManagementUI
Commit b294e671 authored by hasan khaddour's avatar hasan khaddour
Browse files
Options

fixskeleton

parent ed17abb6
Hide whitespace changes
Inline Side-by-side
Showing with 234 additions and 100 deletions
src/app/customers/pages/customer-list/customer-list.component.html
View file @ b294e671
...@@ -9,7 +9,15 @@ ...@@ -9,7 +9,15 @@
<button type="button" [disabled]="!canEditCustomer()" (click)="this.router.navigate(['customers/create'])" class="btn btn-primary"><span class="fe fe-file-plus fe-12 mr-2"></span>إضافة جهة جديدة</button> <button type="button" [disabled]="!canEditCustomer()" (click)="this.router.navigate(['customers/create'])" class="btn btn-primary"><span class="fe fe-file-plus fe-12 mr-2"></span>إضافة جهة جديدة</button>
</div> </div>
</div> </div>
<div class="row"> <div class="row" *ngIf="!customers" >
<item-skeleton class="col-4 offset-1">
</item-skeleton>
</div>
<div class="row" *ngIf="customers">
<customer-item (click)="this.router.navigate(['customers/detail', cust.id])" *ngFor="let cust of customers" class="col-md-3" [customer]="cust"></customer-item> <customer-item (click)="this.router.navigate(['customers/detail', cust.id])" *ngFor="let cust of customers" class="col-md-3" [customer]="cust"></customer-item>
</div> </div>
......
src/app/employees/pages/employee-participates/employee-participates.component.html
View file @ b294e671
...@@ -5,4 +5,8 @@ ...@@ -5,4 +5,8 @@
<div *ngIf="employeeParticipates.length==0"> <div *ngIf="employeeParticipates.length==0">
للأسف أنت لم تشارك حتى الآن بأي مشروع للأسف أنت لم تشارك حتى الآن بأي مشروع
</div> </div>
</section> </section>
\ No newline at end of file
<card-skeleton *ngIf="!employeeParticipates">
</card-skeleton>
\ No newline at end of file
src/app/pages/login/login.component.html
View file @ b294e671
<div class="wrapper vh-100"> <div class="wrapper vh-100">
<div class="row align-items-center h-100"> <div class="row align-items-center h-100">
<form class="col-lg-3 col-md-4 col-10 mx-auto text-center"> <form class="col-lg-3 col-md-4 mx-auto text-center">
<a class="navbar-brand mx-auto mt-2 flex-fill text-center" href="./index.html"> <a class="navbar-brand mx-auto mt-2 flex-fill text-center" href="./index.html">
<img id="logo" class="navbar-brand-img brand-md" <img id="logo" class="navbar-brand-img brand-md"
src="/assets/images/logo/logo.ico" src="/assets/images/logo/logo.ico"
......
src/app/pages/project-faq/project-faq.component.html
View file @ b294e671
...@@ -65,6 +65,31 @@ ...@@ -65,6 +65,31 @@
</div> </div>
</div> </div>
<div class="card basic">
<div class="card-body">
<h5 class="card-title"><strong>ماذا يجب أن تفعل في مرحلة الإغلاق؟ </strong></h5>
<div>
<h6> تحديد تقييم الجهة الطارحة </h6>
</div>
<div class="pt-2">
<h6>تحديد ملاحظات الجهة الطارحة </h6>
</div>
<div class="pt-2">
<h6>حل فريق العمل</h6>
</div>
<div class="pt-2">
<h6>إصدار تقرير إنجاز</h6>
</div>
</div>
</div>
</div> </div>
......
src/app/projects-types/pages/types-list/types-list.component.html
View file @ b294e671
<section *ngIf="types" class="row"> <section class="row">
<div class="row justify-content-center"> <div class="row justify-content-center">
<div class="col-12"> <div class="col-12">
<div class="row align-items-center my-4"> <div class="row align-items-center my-4">
...@@ -12,7 +12,12 @@ ...@@ -12,7 +12,12 @@
<hr> <hr>
<type-item class=" offset-2" <card-skeleton *ngIf="!types">
</card-skeleton>
<div *ngIf="types">
<type-item class=" offset-2"
*ngFor="let item of types" *ngFor="let item of types"
[item]="item" [item]="item"
(edit)="openEditModal(item)" (edit)="openEditModal(item)"
...@@ -28,6 +33,9 @@ ...@@ -28,6 +33,9 @@
</strong> </strong>
</div> </div>
</div>
</div>
</div>
</div> </div>
</section> </section>
src/app/projects-types/projects-types.module.ts
View file @ b294e671
...@@ -9,6 +9,7 @@ import { EditTypeModalComponent } from './components/edit-type-modal/edit-type-m ...@@ -9,6 +9,7 @@ import { EditTypeModalComponent } from './components/edit-type-modal/edit-type-m
import { FormsModule } from '@angular/forms'; import { FormsModule } from '@angular/forms';
import { TypesDetailComponent } from './pages/types-detail/types-detail.component'; import { TypesDetailComponent } from './pages/types-detail/types-detail.component';
import { RemoveTyoeModalComponent } from './components/remove-tyoe-modal/remove-tyoe-modal.component'; import { RemoveTyoeModalComponent } from './components/remove-tyoe-modal/remove-tyoe-modal.component';
import { SharedModule } from '../shared/shared.module';
@NgModule({ @NgModule({
...@@ -23,6 +24,7 @@ import { RemoveTyoeModalComponent } from './components/remove-tyoe-modal/remove- ...@@ -23,6 +24,7 @@ import { RemoveTyoeModalComponent } from './components/remove-tyoe-modal/remove-
imports: [ imports: [
CommonModule, CommonModule,
FormsModule, FormsModule,
SharedModule,
ProjectsTypesRoutingModule ProjectsTypesRoutingModule
] ]
}) })
......
src/app/projects/components/cancel-project/cancel-project.component.html
View file @ b294e671
<div class="modal-header"> <div class="modal-header">
<h5 class="modal-title" id="moveToplanModalLabel">انجاز مشروع</h5> <h5 class="modal-title" id="moveToplanModalLabel">إلغاء مشروع</h5>
<button type="button" class="ml-4 mr-4 btn-close" (click)="onClose()" ></button> <button type="button" class="ml-4 mr-4 btn-close" (click)="onClose()" ></button>
</div> </div>
<div class="modal-body"> <div class="modal-body">
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
</div> </div>
<div class="row "> <div class="row ">
<button type="submit" [disabled]="projectForm.invalid || !canComplete" class="col m-4 btn btn-primary">انجاز المشروع</button> <button type="submit" [disabled]="projectForm.invalid || !canComplete" class="col m-4 btn btn-primary">إلغاء المشروع</button>
<button class="col m-4 btn btn-seondary" (click)="onClose()" >إغلاق</button> <button class="col m-4 btn btn-seondary" (click)="onClose()" >إغلاق</button>
</div> </div>
......
src/app/projects/components/modals/add-attachment-modal/add-attachment-modal.component.html
View file @ b294e671
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<div class="modal-body"> <div class="modal-body">
<form #form="ngForm" (ngSubmit)="onSubmit()" #projectForm="ngForm"> <form #form="ngForm" (ngSubmit)="onSubmit()" #projectForm="ngForm">
<div class="row"> <div class="row">
<div class="mb-3 col-3 offset-1"> <div class="mb-3 col-4 offset-1">
<label for="attachmentName" class="form-label">اسم المرفق</label> <label for="attachmentName" class="form-label">اسم المرفق</label>
<input <input
type="text" type="text"
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
/> />
</div> </div>
<div class="mb-3 col-7 "> <div class="mb-3 col-7 offset-1 ">
<label for="attachmentDescription" class="form-label">الوصف</label> <label for="attachmentDescription" class="form-label">الوصف</label>
<textarea <textarea
[cols]="4" [cols]="4"
...@@ -31,12 +31,12 @@ ...@@ -31,12 +31,12 @@
> >
</textarea> </textarea>
</div> </div>
<div class="col-8 offset-1"> <!-- <div class="col-8 offset-1">
<input type="file" name="file" <input type="file" name="file"
(change)="onFileSelected($event)" (change)="onFileSelected($event)"
[(ngModel)]="item.file" required /> [(ngModel)]="item.file" required />
</div> </div>
-->
<p-fileUpload <p-fileUpload
class="col-10 offset-1" class="col-10 offset-1"
[customUpload]="true" [customUpload]="true"
......
src/app/projects/components/modals/add-attachment-modal/add-attachment-modal.component.ts
View file @ b294e671
...@@ -47,7 +47,7 @@ export class AddAttachmentModalComponent { ...@@ -47,7 +47,7 @@ export class AddAttachmentModalComponent {
next: (data)=>{ next: (data)=>{
this.activeModal.close(true); // Close modal and pass data this.activeModal.close(this.item); // Close modal and pass data
}, },
error: (err )=> this.toastr.error("لقد حدث خطاء ما") error: (err )=> this.toastr.error("لقد حدث خطاء ما")
......
src/app/projects/components/project-controll/info-controll/info-controll.component.html
View file @ b294e671
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
<span class="fe fe-map fe-16 text-white"></span> <span class="fe fe-map fe-16 text-white"></span>
</div> </div>
<div class="flex-fill ml-4 fname"> <div class="flex-fill ml-4 fname">
<strong>إدارة المشاركين</strong><br /> <strong> المشاركين</strong><br />
</div> </div>
</div> </div>
</div> </div>
......
src/app/projects/pages/participants-list/participants-list.component.html
View file @ b294e671
...@@ -17,9 +17,12 @@ ...@@ -17,9 +17,12 @@
</div> </div>
</div> </div>
<hr /> <hr />
<item-skeleton class="col-3" *ngIf="!participants"> <div class="row"*ngIf="!participants">
</item-skeleton> <item-skeleton class="col-3" >
</item-skeleton>
</div>
<div class="row" *ngIf="participants" > <div class="row" *ngIf="participants" >
<participant-item <participant-item
...@@ -57,8 +60,8 @@ ...@@ -57,8 +60,8 @@
<div class="row align-items-center"> <div class="row align-items-center">
<div class="col-8 "> <div class="col-8 ">
<div class="small mb-2 d-flex"> <div class="small mb-2 d-flex">
<span class="text-muted flex-fill">الوظيفة / الهيئة {{selectedParticipant.employee.workInfo.workJob}} / {{selectedParticipant.employee.workInfo.workType}}</span> <span class="text-muted flex-fill">الوظيفة / الهيئة : {{selectedParticipant.employee.workInfo.workJob}} / {{selectedParticipant.employee.workInfo.workType}}</span>
<span class="text-muted">نسبة التفرغ {{selectedParticipant.partialTimeRatio}}</span> <span class="text-muted">نسبة التفرغ : {{selectedParticipant.partialTimeRatio}}</span>
</div> </div>
</div> </div>
......
src/app/projects/pages/participants-list/participants-list.component.ts
View file @ b294e671
...@@ -11,6 +11,7 @@ import { NgModel } from '@angular/forms'; ...@@ -11,6 +11,7 @@ import { NgModel } from '@angular/forms';
import { RemoveParticipantModalComponent } from '../../components/modals/remove-participant-modal/remove-participant-modal.component'; import { RemoveParticipantModalComponent } from '../../components/modals/remove-participant-modal/remove-participant-modal.component';
import { EditParticipantModalComponent } from '../../components/modals/edit-participant-modal/edit-participant-modal.component'; import { EditParticipantModalComponent } from '../../components/modals/edit-participant-modal/edit-participant-modal.component';
import { ChangeEmployeeParticipationRequest } from '../../models/requests/project-requests/ChangeEmployeeParticipationRequest'; import { ChangeEmployeeParticipationRequest } from '../../models/requests/project-requests/ChangeEmployeeParticipationRequest';
import { UserService } from '../../../core/services/authentication/user.service';
@Component({ @Component({
selector: 'participants-list', selector: 'participants-list',
...@@ -30,7 +31,8 @@ export class ParticipantsListComponent { ...@@ -30,7 +31,8 @@ export class ParticipantsListComponent {
private route: ActivatedRoute, private route: ActivatedRoute,
private activeModal : NgbModal, private activeModal : NgbModal,
public router :Router, public router :Router,
private modalService :NgbModal private modalService :NgbModal,
private userService : UserService
) { ) {
...@@ -160,6 +162,7 @@ openUpdateModal(): void { ...@@ -160,6 +162,7 @@ openUpdateModal(): void {
}); });
} }
closeModal(name :string) { closeModal(name :string) {
this.activeModal.dismissAll(); this.activeModal.dismissAll();
......
src/app/projects/pages/project-attachments/project-attachments.component.html
View file @ b294e671
<section *ngIf="attachments" class="row"> <section class="row">
<div class="row justify-content-center" > <div class="row justify-content-center" >
<div class="col-12"> <div class="col-12">
<div class="row align-items-center my-4"> <div class="row align-items-center my-4">
...@@ -18,7 +18,15 @@ ...@@ -18,7 +18,15 @@
</div> </div>
</div> </div>
<hr /> <hr />
<div class="row"> <div class="row" *ngIf="!attachments">
<item-skeleton class="col-4 ">
</item-skeleton>
</div>
<div *ngIf="attachments">
<div class="row">
<attahment-item <attahment-item
class="col-3" class="col-3"
...@@ -31,7 +39,11 @@ ...@@ -31,7 +39,11 @@
<div *ngIf="attachments.length == 0"> <div *ngIf="attachments.length == 0">
للأسف هذا المشروع لايحوي على أية مرفقات للأسف هذا المشروع لايحوي على أية مرفقات
</div> </div>
</div>
</div> </div>
</div> </div>
......
src/app/projects/pages/project-bycreterion/project-bycreterion.component.html
View file @ b294e671
...@@ -24,6 +24,9 @@ ...@@ -24,6 +24,9 @@
</div> </div>
</div> </div>
</div> </div>
<card-skeleton *ngIf="!projects"> <div class="row" *ngIf="!projects">
</card-skeleton> <item-skeleton class="col-4 ">
\ No newline at end of file
</item-skeleton>
</div>
\ No newline at end of file
src/app/projects/pages/project-list/project-list.component.html
View file @ b294e671
...@@ -13,9 +13,13 @@ ...@@ -13,9 +13,13 @@
</div> </div>
<hr> <hr>
<item-skeleton *ngIf="projects"> <div *ngIf="!projects" class="row">
<item-skeleton class="col-4 ">
</item-skeleton>
</div>
</item-skeleton>
<div *ngIf="projects"> <div *ngIf="projects">
<div class="row" *ngIf="projects.length > 0"> <div class="row" *ngIf="projects.length > 0">
<project-item class="col col-4 " *ngFor="let project of projects" [project]="project"></project-item> <project-item class="col col-4 " *ngFor="let project of projects" [project]="project"></project-item>
......
src/app/reports/componenets/project-report-layout/project-header/project-header.component.html
View file @ b294e671
<div class="row mb-5 d-flex justify-content-start"> <div class="row mb-5 d-flex justify-content-center">
<div class="col-3 d-none text-left mb-4"> <div class="col-3 d-none text-left mb-4">
<h5 class="mb-0 text-uppercase"><small>الجمهورية العربية السورية</small></h5> <h5 class="mb-0 text-uppercase"><small>الجمهورية العربية السورية</small></h5>
......
src/app/reports/pages/annual-spend-report/annual-spend-report.component.html
View file @ b294e671
<div class="container-fluid" *ngIf="project"> <div class="container-fluid">
<div class="row justify-content-center"> <div class="row justify-content-center">
<div class="col-12"> <div class="col-12">
<div class="row align-items-center mb-4"> <div class="row align-items-center mb-4">
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
</div> </div>
</div> </div>
<div class="card shadow" id="pdfContent"> <div class="card shadow" id="pdfContent" *ngIf="project">
<div class="card-body p-5"> <div class="card-body p-5">
<project-header [projectInfo]="project.projectInfo"></project-header> <project-header [projectInfo]="project.projectInfo"></project-header>
<project-subjective [project]="project"> </project-subjective> <project-subjective [project]="project"> </project-subjective>
...@@ -76,6 +76,11 @@ ...@@ -76,6 +76,11 @@
</div> </div>
<!-- /.card-body --> <!-- /.card-body -->
</div> </div>
<card-skeleton *ngIf="!project">
</card-skeleton>
<!-- /.card --> <!-- /.card -->
</div> </div>
<!-- /.col-12 --> <!-- /.col-12 -->
......
src/app/reports/pages/employee-work-track/employee-work-track.component.html
View file @ b294e671
<div class="container-fluid" *ngIf="project && employeesTrack && employeee "> <div class="container-fluid">
<div class="row justify-content-center"> <div class="row justify-content-center">
<div class="col-12"> <div class="col-12">
<div class="row align-items-center mb-4"> <div class="row align-items-center mb-4">
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
</div> </div>
</div> </div>
<div class="card shadow" id="pdfContent"> <div class="card shadow" id="pdfContent" *ngIf="project && employeesTrack && employeee ">
<div class="card-body p-5"> <div class="card-body p-5">
<project-subjectiv-unformal <project-subjectiv-unformal
[project]="project" [project]="project"
...@@ -51,6 +51,11 @@ ...@@ -51,6 +51,11 @@
</div> </div>
<!-- /.card-body --> <!-- /.card-body -->
</div> </div>
<card-skeleton *ngIf="!(project && employeesTrack && employeee)">
</card-skeleton>
<!-- /.card --> <!-- /.card -->
</div> </div>
<!-- /.col-12 --> <!-- /.col-12 -->
......
src/app/reports/pages/employees-track-report/employees-track-report.component.html
View file @ b294e671
<div class="container-fluid" *ngIf="project && track && employeesTrack "> <div class="container-fluid" >
<div class="row justify-content-center"> <div class="row justify-content-center">
<div class="col-12"> <div class="col-12">
<div class="row align-items-center mb-4"> <div class="row align-items-center mb-4">
<div class="col"> <div class="col">
<h2 class="h5 page-title"> <h2 class="h5 page-title">
<small class="text-muted text-uppercase">بطاقة معلومات مشروع</small> <small class="text-muted text-uppercase">بطاقة انشغالية عاملين</small>
</h2> </h2>
</div> </div>
<div class="col-auto"> <div class="col-auto">
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
</button> </button>
<button <button
[routerLink]="['/reports/step-tracks',projectId,'track',trackId]" [routerLink]="['/reports/steps-tracks',projectId,'track',trackId]"
type="button" class="btn mr-1 btn-secondary m-1"> type="button" class="btn mr-1 btn-secondary m-1">
تقرير متابعة المراحل تقرير متابعة المراحل
</button> </button>
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
</div> </div>
</div> </div>
<div class="card shadow" id="pdfContent"> <div class="card shadow" id="pdfContent" *ngIf="project && track && employeesTrack ">
<div class="card-body p-5"> <div class="card-body p-5">
<project-header [projectInfo]="project.projectInfo"></project-header> <project-header [projectInfo]="project.projectInfo"></project-header>
<project-subjective [project]="project"> </project-subjective> <project-subjective [project]="project"> </project-subjective>
...@@ -77,6 +77,12 @@ ...@@ -77,6 +77,12 @@
</div> </div>
<!-- /.card-body --> <!-- /.card-body -->
</div> </div>
<card-skeleton *ngIf="!(project && track && employeesTrack )">
</card-skeleton>
<!-- /.card --> <!-- /.card -->
</div> </div>
<!-- /.col-12 --> <!-- /.col-12 -->
......
src/app/reports/pages/project-completion/project-completion.component.html
View file @ b294e671
<div class="container-fluid" *ngIf="project && contributers "> <div class="container-fluid">
<div class="row justify-content-center"> <div class="row justify-content-center">
<div class="col-12"> <div class="col-12">
<div class="row align-items-center mb-4"> <div class="row align-items-center mb-4">
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
</div> </div>
</div> </div>
<div class="card shadow" id="pdfContent"> <div class="card shadow" id="pdfContent" *ngIf="project && contributers ">
<div class="card-body p-5"> <div class="card-body p-5">
<project-header [projectInfo]="project.projectInfo"></project-header> <project-header [projectInfo]="project.projectInfo"></project-header>
<project-subjective [project]="project"> </project-subjective> <project-subjective [project]="project"> </project-subjective>
...@@ -52,6 +52,11 @@ ...@@ -52,6 +52,11 @@
</div> </div>
<!-- /.card-body --> <!-- /.card-body -->
</div> </div>
<card-skeleton *ngIf="!(project && contributers)">
</card-skeleton>
<!-- /.card --> <!-- /.card -->
</div> </div>
<!-- /.col-12 --> <!-- /.col-12 -->
......
src/app/reports/pages/project-definition/project-definition.component.html
View file @ b294e671
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
</div> </div>
</div> </div>
<div class="card shadow" id="pdfContent"> <div class="card shadow" id="pdfContent" *ngIf="project">
<div class="card-body p-5"> <div class="card-body p-5">
<project-header [projectInfo]="project.projectInfo"></project-header> <project-header [projectInfo]="project.projectInfo"></project-header>
<project-subjective [project]="project"> </project-subjective> <project-subjective [project]="project"> </project-subjective>
...@@ -54,6 +54,11 @@ ...@@ -54,6 +54,11 @@
</div> </div>
<!-- /.card-body --> <!-- /.card-body -->
</div> </div>
<card-skeleton *ngIf="!project">
</card-skeleton>
<!-- /.card --> <!-- /.card -->
</div> </div>
<!-- /.col-12 --> <!-- /.col-12 -->
......
src/app/tracks/pages/tracks-list/tracks-list.component.html
View file @ b294e671
<section *ngIf="tracks" class="row"> <section class="row">
<div class="row justify-content-center"> <div class="row justify-content-center">
<div class="col-12"> <div class="col-12">
<div class="row align-items-center my-4"> <div class="row align-items-center my-4">
<div class="col"> <div class="col">
<h2 class="h3 mb-0 page-title"> قائمة عمليات المتابعة </h2> <h2 class="h3 mb-0 page-title">قائمة عمليات المتابعة</h2>
</div>
<div class="col-4">
<div class="row">
<input class="mb-2 form-control col-8 " type="month" [(ngModel)]="month" placeholder="اختر شهر" />
<button class="btn btn-primary col " (click)="onFilter()">حسب الشهر </button>
</div></div>
</div>
<hr>
<div class="card shadow mb-4 col-8 offset-2" *ngFor="let track of tracks">
<div class="card-header py-3">
<div class="row align-items-center">
<div class="col-auto">
<a href="profile-posts.html" class="avatar avatar-md">
<img src="./assets/images/users/4.jpg" alt="..." class="avatar-img rounded-circle">
</a>
</div> </div>
<div class="col ml-n2"> <div class="col-4">
<strong class="mb-1">متابعة {{track.projectInfo.name}}</strong><span class=" ml-1"></span> <div class="row">
<p class="small text-muted mb-1">الوضع الراهن {{track.trackInfo.statusDescription}}</p> <input
</div> class=" form-control mr-2 col-8"
<div class="col-auto"> type="month"
[(ngModel)]="month"
placeholder="اختر شهر"
/>
<button class="btn btn-primary col" (click)="onFilter()">
حسب الشهر
</button>
</div>
</div> </div>
</div> </div>
</div> <hr />
<div class="card-body ">
<div class="row align-items-center"> <div class="row" *ngIf="!tracks">
<div class="col-8 "> <item-skeleton class="col-4"> </item-skeleton>
<div class="small mb-2 d-flex"> </div>
<span class="text-muted flex-fill">الملاحظات {{track.notes}}</span> <div *ngIf="tracks">
<span class="text-muted">تاريخ المتابعة {{track.trackInfo.trackDate| date}}</span> <div
class="card shadow mb-4 col-8 offset-2"
*ngFor="let track of tracks"
>
<div class="card-header py-3">
<div class="row align-items-center">
<div class="col-auto">
<a href="profile-posts.html" class="avatar avatar-md">
<img
src="./assets/images/users/4.jpg"
alt="..."
class="avatar-img rounded-circle"
/>
</a>
</div>
<div class="col ml-n2">
<strong class="mb-1">متابعة {{ track.projectInfo.name }}</strong
><span class="ml-1"></span>
<p class="small text-muted mb-1">
الوضع الراهن {{ track.trackInfo.statusDescription }}
</p>
</div>
<div class="col-auto"></div>
</div>
</div> </div>
</div> <div class="card-body">
<div class="col-8 "> <div class="row align-items-center">
<div class="small mb-2 d-flex"> <div class="col-8">
<div class="small mb-2 d-flex">
<span class="text-muted badge flex-fill">{{track.trackInfo.isCompleted ? 'مكتملة':'غير مكتملة'}} </span> <span class="text-muted flex-fill"
>الملاحظات {{ track.notes }}</span
>
<span class="text-muted"
>تاريخ المتابعة {{ track.trackInfo.trackDate | date }}</span
>
</div>
</div>
<div class="col-8">
<div class="small mb-2 d-flex">
<span class="text-muted badge flex-fill"
>{{ track.trackInfo.isCompleted ? "مكتملة" : "غير مكتملة" }}
</span>
</div>
<div class="row">
<button
[routerLink]="[
'/reports/employees-tracks',
track.projectId,
'track',
track.id
]"
class="btn m-4 btn-secondary col-5"
>
تقرير انشغالية عاملين
</button>
<button
[routerLink]="[
'/reports/steps-tracks',
track.projectId,
'track',
track.id
]"
class="btn m-4 btn-secondary col-4"
>
تقرير متابعة مراحل
</button>
</div>
</div>
</div>
</div> </div>
<!-- / .card-body -->
<div class="col-auto">
<button [routerLink]="['/reports/employees-tracks',track.projectId,'track',track.id]" class="btn m-4 btn-primary col-3 offset-1">تقرير انشغالية عاملين </button>
<button [routerLink]="['/reports/steps-tracks',track.projectId,'track',track.id]" class="btn m-4 btn-primary col-3 offset-1">تقرير متابعة مراحل </button>
</div> </div>
</div>
</div>
</div> <!-- / .card-body -->
</div>
<div *ngIf="tracks.length==0" class="text-center text-primary"> <div *ngIf="tracks.length == 0" class="text-center text-primary">
<strong> <strong> للأسف لايحوي على أية متابعات </strong>
للأسف لايحوي على أية متابعات
</strong>
</div> </div>
</div>
</div> </div>
</div> </div>
</section> </section>
src/app/tracks/pages/tracks-list/tracks-list.component.ts
View file @ b294e671
...@@ -45,7 +45,7 @@ export class TracksListComponent implements OnInit{ ...@@ -45,7 +45,7 @@ export class TracksListComponent implements OnInit{
next : (data)=>{ next : (data)=>{
this.toastr.success("تم تحميل عمليات المتابعة بنجاح"); this.toastr.success("تم تحميل عمليات المتابعة بنجاح");
this.tracks= data; this.tracks= data.sort((e ,p ) => Number(new Date(e.trackInfo.trackDate).getTimezoneOffset() - new Date (p.trackInfo.trackDate).getTimezoneOffset()));
} }
, ,
......
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

HIAST - GitLab