Skip to content

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

fix s

parent c63882b7
Show whitespace changes
Inline Side-by-side
Showing with 45 additions and 26 deletions
src/app/core/services/authentication/authentication.service.ts
View file @ 14fd9a94
......@@ -8,6 +8,7 @@ import { catchError, Observable, tap, throwError } from 'rxjs';
import { ConfigurationService } from '../configuration/configuration.service';
import { DataStorageService } from '../dataStorage/data-storage.service';
import { CookieService } from 'ngx-cookie-service';
import { Router } from '@angular/router';
//#endregion Imports
......@@ -22,7 +23,8 @@ export class AuthenticationService {
private http : HttpClient,
private config : ConfigurationService,
private dataStorage : DataStorageService,
private cookieService :CookieService
private cookieService :CookieService ,
private router : Router
) { }
//#endregion Consrtuctor
......@@ -86,6 +88,7 @@ export class AuthenticationService {
logout(){
this.cookieService.delete('token');
this.dataStorage.removeItem("userDetails");
this.router.navigate([''])
}
//#endregion Logout
......
src/app/projects-types/components/type-item/type-item.component.html
View file @ 14fd9a94
......@@ -36,8 +36,8 @@
</div>
<div class="col-auto">
<button type="button" (click)="onEdit()" class="btn m-2 btn-sm btn-secondary">تعديل المعلومات</button>
<button type="button" (click)="onDelete()"class="btn m-2 btn-sm btn-danger">إزالة</button>
<button type="button" [disabled]="canSee()" (click)="onEdit()" class="btn m-2 btn-sm btn-secondary">تعديل المعلومات</button>
<button type="button" [disabled]="canSee()" (click)="onDelete()"class="btn m-2 btn-sm btn-danger">إزالة</button>
</div>
</div>
......
src/app/projects-types/components/type-item/type-item.component.ts
View file @ 14fd9a94
import { Component, EventEmitter, Input, Output } from '@angular/core';
import { ProjectType } from '../../models/responses/projectType';
import { UserService } from '../../../core/services/authentication/user.service';
import { ROLES } from '../../../core/constants/roles';
......@@ -14,6 +16,13 @@ export class TypeItemComponent {
@Output() edit = new EventEmitter<void>();
@Output() delete = new EventEmitter<void>();
constructor(
private ser : UserService
){}
canSee(){
return this.ser.hasRole(ROLES.CUSTOMERS_PLANER)
}
onEdit() {
this.edit.emit();
}
......
src/app/projects/components/modals/edit-participant-modal/edit-participant-modal.component.html
View file @ 14fd9a94
......@@ -14,7 +14,7 @@
</div>
<button type="submit" class="col-4 offset-2 btn btn-primary" [disabled]="!editParticipantForm.valid">حفظ</button>
<button type="button" (click)="closeModal()">إلغاء</button>
<button type="button"class="col-4 offset-2 btn btn-secondary" (click)="closeModal()">إلغاء</button>
</form>
</div>
src/app/projects/components/modals/remove-participant-modal/remove-participant-modal.component.html
View file @ 14fd9a94
<!-- remove-participant-modal.component.html -->
<div class="modal fade" id="removeParticipantModal" tabindex="-1" aria-labelledby="removeParticipantModalLabel" aria-hidden="true">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title" id="removeParticipantModalLabel">إزالة مشارك من المشروع</h5>
<button type="button" class="ml-4 mr-4 btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
<button type="button" class="ml-4 mr-4 btn-close" (click)="close()"></button>
</div>
<div class="modal-body">
<p class="text-center text-danger">هل أنت متأكد من أنك تريد إزالة السيد {{participant.employee.personalInfo | fullname}} من قائمة المشاركين في المشروع</p>
......@@ -13,7 +9,4 @@
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">إلغاء</button>
<button type="button" class="btn btn-danger" (click)="onConfirmRemove()">إزالة</button>
</div>
</div>
</div>
</div>
\ No newline at end of file
src/app/projects/components/modals/remove-participant-modal/remove-participant-modal.component.ts
View file @ 14fd9a94
......@@ -30,5 +30,8 @@ export class RemoveParticipantModalComponent {
});
}
close (){
this.activeModal.close();
}
}
src/app/projects/components/projectModals/project-complete-modal/project-complete-modal.component.html
View file @ 14fd9a94
......@@ -14,21 +14,19 @@
<div class="row">
<p>
استمارة انجاز مشروع
</p>
<div class="mb-3 col-8 offset-1">
<label for="stepName" class="form-label">ملاحظات الجهة الطارحة</label>
<textarea [cols]="4" type="text" name="stepName" id="stepName" class="form-control" [(ngModel)]="request.customerNotes" required>
</textarea>
</div>
<div class="mb-3 col-3 offset-1 ">
<div class="mb-3 col-6 offset-1 ">
<label for="start" class="form-label">تاريخ الاكمال</label>
<input type="date" id="start" class="form-control" [(ngModel)]="request.completionDate" name="start" required>
</div>
<div class="mb-3 col-3">
<div class="mb-3 col-6 offset-1">
<label for="worker" class="form-label">تقييم الجهة الطارحة </label>
<input id="worker" class="form-control" [(ngModel)]="request.customerRate" name="worker" required>
</div>
......
src/app/projects/pages/participants-list/participants-list.component.html
View file @ 14fd9a94
......@@ -76,8 +76,8 @@
</div>
<div class="col-10">
<button type="button" class="btn m-2 btn-sm btn-primary">استعراض تاريخ تبدلاته </button>
<button type="button" (click)="onParticipantUpdated()" class="btn m-2 btn-sm btn-secondary">تعديل معلومات المشاركة</button>
<button type="button" [routerLink]="['/projects',projectId,'history','participationChange',selectedParticipant.employeeId]"class="btn m-2 btn-sm btn-primary">استعراض تاريخ تبدلاته </button>
<button type="button" (click)="openUpdateModal()" class="btn m-2 btn-sm btn-secondary">تعديل معلومات المشاركة</button>
<button type="button" (click)="openDeleteModal()" class="btn m-2 btn-sm btn-danger">إزالة</button>
<button type="button" [routerLink]="['/reports/contributions',selectedParticipant.projectId,'employee',selectedParticipant.employeeId]" class="btn btn-sm btn-secondary">المساهمات</button>
......
src/app/projects/pages/participants-list/participants-list.component.ts
View file @ 14fd9a94
......@@ -94,7 +94,7 @@ export class ParticipantsListComponent {
if (result) {
// Add the new project to the list
this.isDetailMode=false ;
this.participants=this.participants.filter(w => w.employeeId == this.selectedParticipant.employeeId)
this.participants=this.participants.filter(w => w.employeeId != this.selectedParticipant.employeeId)
}
......@@ -115,6 +115,8 @@ openUpdateModal(): void {
let part= this.participants.find(w => w.employeeId == this.selectedParticipant.employeeId)
part!.partialTimeRatio=result.partialTimeRation;
this.selectedParticipant.partialTimeRatio=result.partialTimeRation
this.selectedParticipant.role=result.role
part!.role=result.role;
......
src/app/projects/pages/project-create/project-create.component.ts
View file @ 14fd9a94
......@@ -210,7 +210,7 @@ export class ProjectCreateComponent {
next: (data)=>{
this.toastr.success("تمت إضافة الجهة بنجاح")
this.router.navigate(['/projects/detail/',data])
this.router.navigate(['/projects/detail/'+data.id])
},
error:(err)=>{
......
src/app/shared/sharedLayout/sidebar/sidebar.component.html
View file @ 14fd9a94
......@@ -30,7 +30,7 @@
<i class="fe fe-map"></i><span> استعراض أنواع المشاريع</span>
</a>
</li>
<li class="nav-item" *ngIf="hasRole('Planner')">
<li class="nav-item" *ngIf="hasRole(alroles.PROJECTS_PLANNER)">
<a [routerLink]="['/types/create']" class="nav-link collapsed">
<i class="fe fe-edit-2"></i><span>إضافة نوع جديد</span>
</a>
......@@ -44,7 +44,7 @@
</li>
<li class="nav-item">
<a
*ngIf="hasRole('Planner')"
*ngIf="hasRole(alroles.CUSTOMERS_PLANER)"
[routerLink]="['/customers/create']"
class="nav-link collapsed"
>
......
src/app/tracks/components/history/employee-history-item/employee-history-item.component.html
View file @ 14fd9a94
......@@ -31,7 +31,7 @@
<div class="col-auto">
<button type="button " [routerLink]="['/tracks/project/',empoyeeTrack.trackId]" class="btn m-2 btn-sm btn-secondary">الاطلاع على عملية المتابعة</button>
<button type="button " *ngIf="canSee()" [routerLink]="['/tracks/project/',empoyeeTrack.trackId]" class="btn m-2 btn-sm btn-secondary">الاطلاع على عملية المتابعة</button>
</div>
</div>
......
src/app/tracks/components/history/employee-history-item/employee-history-item.component.ts
View file @ 14fd9a94
import { Component, Input } from '@angular/core';
import { EmployeeTrack } from '../../../models/responses/employeeTrack';
import { UserService } from '../../../../core/services/authentication/user.service';
import { ROLES } from '../../../../core/constants/roles';
@Component({
selector: 'employee-history-item',
......@@ -9,4 +11,13 @@ import { EmployeeTrack } from '../../../models/responses/employeeTrack';
export class EmployeeHistoryItemComponent {
@Input() empoyeeTrack :EmployeeTrack
constructor(
private userService : UserService
){}
canSee(): any {
return this.userService.hasRole(ROLES.SCIENTIFIC_DEPUTY)||this.empoyeeTrack.employeeId==this.userService.getEmployeeId();
}
}
src/app/tracks/components/step-track/step-track.component.html
View file @ 14fd9a94
......@@ -23,7 +23,7 @@
<div class="col-auto">
<button type="button "[routerLink]="['/track/history/step',stepTrack.stepId]" class="btn m-2 btn-sm btn-secondary">تاريخ المتابعة</button>
<button type="button "[routerLink]="['/tracks/history/step',stepTrack.stepId]" class="btn m-2 btn-sm btn-secondary">تاريخ المتابعة</button>
<button type="button" (click)="onEdit()" class="btn m-2 btn-sm btn-secondary">تعديل</button>
</div>
</div>
......
src/app/tracks/pages/track-details/track-details.component.ts
View file @ 14fd9a94
......@@ -265,7 +265,7 @@ export class TrackDetailsComponent implements OnInit {
this._canComplete();
this.stepTracks.push(st)
this.steps=this.steps.filter(e => e.id == s?.id)
this.steps=this.steps.filter(e => e.id == s!.id)
this.trackedSteps.push(s!);
}
......
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