trainee

src/app/dashboard/Registration-trainee-movement/registration-trainee-movement-add/registration-trainee-movement-add.component.html

@@ -188,7 +188,7 @@
                   </div>
 
                 <!-- <h2 class="departmentHeading-w">أختر الأقسام <span>(قم بإختيار قسم كحد أدني)</span></h2> -->
-                  <div class="col-12 col-sm-12 col-md-4 col-lg-4">
+                  <!-- <div class="col-12 col-sm-12 col-md-4 col-lg-4">
                     <div class="form-group">
                       <label for="department1" style="float:right;">القسم الأول</label>
                       <select class="form-control selectStyle-w" id="department1" name="department1" (input)="changeDepartment($event , 1)" [(ngModel)]="formData.department1" [disabled]="disabledInput">
@@ -214,7 +214,7 @@
                         <option [value]="2003">حذف</option>
                       </select>
                     </div>
-                  </div>
+                  </div> -->
                 </div>
               </div>
             </div>

src/app/dashboard/final-accreditation-of-trainees/final-accerditation-list/final-accerditation-list.component.html

@@ -40,27 +40,38 @@
           </div>
       </div>
   
-      <table class="table table-bordered">
-        <thead class="headBackground-w">
-          <tr>
-            <th> إسم المتدرب</th>
-            <th>إسم التخصص</th>
-            <th>إسم التخصص الدقيق</th>
-            <th> الجامعه</th>
-            <th *ngIf="authSer.showEditBtn">تفاصيل المتدرب</th>
-          </tr>
-        </thead>
-        <tbody>
-          <tr *ngFor="let data of dataList | paginate: { itemsPerPage: perPagePagenation, currentPage: currentPage, totalItems: count }; let i = index ">
-            <td>{{data.trainee_name}}</td>
-            <td> {{data.specialization_name}}</td>
-            <td>{{data.specific_specialization}}</td>
-            <td>{{data.university}}</td>
-            <td *ngIf="authSer.showEditBtn"><button type="button" class="btn btn-outline-secondary" (click)="onEdit(data.id)"><i class="fas fa-edit"></i></button></td>
-          </tr>
-        </tbody>
-      </table>
-      <pagination-controls nextLabel="التالي" previousLabel="السابق" (pageChange)="onPageChange($event)"></pagination-controls>
+      <div class="row" *ngIf="dataList.length == 0">
+        <div class="col-12">
+          <h2>لا يوجد بيانات لعرضها</h2>
+        </div>
+      </div>
+      
+      <div class="row" *ngIf="dataList.length > 0">
+        <div class="col-12">
+          <table class="table table-bordered">
+            <thead class="headBackground-w">
+              <tr>
+                <th> إسم المتدرب</th>
+                <th>إسم التخصص</th>
+                <th>إسم التخصص الدقيق</th>
+                <th> الجامعه</th>
+                <th *ngIf="authSer.showEditBtn">تفاصيل المتدرب</th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr *ngFor="let data of dataList | paginate: { itemsPerPage: perPagePagenation, currentPage: currentPage, totalItems: count }; let i = index ">
+                <td>{{data.trainee_name}}</td>
+                <td> {{data.specialization_name}}</td>
+                <td>{{data.specific_specialization}}</td>
+                <td>{{data.university}}</td>
+                <td *ngIf="authSer.showEditBtn"><button type="button" class="btn btn-outline-secondary" (click)="onEdit(data.id)"><i class="fas fa-edit"></i></button></td>
+              </tr>
+            </tbody>
+          </table>
+          <pagination-controls nextLabel="التالي" previousLabel="السابق" (pageChange)="onPageChange($event)"></pagination-controls>
+        </div>
+      </div>
+
     </div>
   
   </div>

src/app/dashboard/final-accreditation-of-trainees/final-accerditation-list/final-accerditation-list.component.ts

@@ -106,9 +106,6 @@ export class FinalAccerditationListComponent implements OnInit {
             (responce) => {
               console.log('rescponce dataaaa', responce);
               this.dataList = responce['requests'];
-              if(this.dataList.length == 0) {
-                this.toastr.warning('القائمه فارغه من الطلبات ');
-              }
               this.count = responce['count'];
               this.perPagePagenation = responce['per_page'];
               console.log('evennnnts', this.dataList);

src/app/dashboard/reivew-trainee-data/review-trainee-add/review-trainee-add.component.css

@@ -185,7 +185,7 @@ select.ng-invalid{
     color: #fff;
 }
 .statusBtn-w {
-    width: 80px;
+    width: 145px;
     margin: 5px 7px;
     cursor: pointer;
     float: right;

src/app/dashboard/reivew-trainee-data/review-trainee-add/review-trainee-add.component.html

@@ -59,7 +59,7 @@
                   <div class="col-12 col-sm-12 col-md-6 col-lg-4">
                     <div class="form-group">
                     <label for="identityNumber" style="float:right">رقم الهويه <span class="spanReqired-w">*</span></label>
-                    <input type="number" class="form-control" placeholder="رقم الهويه" (keypress)="authSer.onKeydown($event)" id="identityNumber" (input)="onIdentitiyChange($event.target.value)" ngModel name="identity_number" [(ngModel)]="userData.identity_number" [disabled]="disabledInput" min="0" required/>
+                    <input type="number" class="form-control" placeholder="رقم الهويه" (keypress)="authSer.onKeydown($event)" id="identityNumber" appOnlyNumber (input)="onIdentitiyChange($event.target.value)" ngModel name="identity_number" [(ngModel)]="userData.identity_number" [disabled]="disabledInput" min="0" required/>
                     <span class="errorMessage-w" *ngIf="identity_id == 1">أدخل رقم هويه مكون من 10 أرقام يبدأ برقم 1</span>
                     <span class="errorMessage-w" *ngIf="identity_id == 2">أدخل رقم هويه مكون من 10 أرقام </span>
                     <span class="errorMessage-w" *ngIf="identity_id == 3">أدخل رقم الإقامه مكون من 10 أرقام يبدأ برقم 2 </span>
@@ -164,6 +164,7 @@
                           : formData.status == 'canceled' ? 'ملغي'
                           : formData.status == 'asked_for_opinion' ? 'طلب رأي القسم'
                           : 'لم يتم تسجيل حاله الطلب'}}</h2>
+                          <!-- <span>{{departmentNameOpinion}}</span> -->
                     </div>
                   <!-- <div class="form-group">
                    
@@ -289,7 +290,7 @@
                     <label for="status" style="float:right; display:block"> الأوامر <span class="spanReqired-w">*</span></label>
                     <button type="button" class="btn btn-success statusBtn-w" (click)="statusShow('accepted')">قبول</button>
                     <button type="button" class="btn btn-danger statusBtn-w" (click)="statusShow('refused')">رفض</button>
-                    <button type="button" class="btn btn-default statusBtn-w" (click)="statusShow('asked_for_opinion')">طلب رأي</button>
+                    <button type="button" class="btn btn-default statusBtn-w" (click)="statusShow('asked_for_opinion')"> طلب رأي القسم</button>
                     <div class="row" *ngIf="showRefusedCause">
                       <div class="col-12">
                         <div class="form-group">

src/app/dashboard/reivew-trainee-data/review-trainee-add/review-trainee-add.component.ts

@@ -34,6 +34,7 @@ export class ReviewTraineeAddComponent implements OnInit {
   editMode: boolean = false; //true in edit mode 
   showPersonalData: boolean = false;
   reportId: number;
+  departmentNameOpinion: string = "";
   attachments_ids = []; //for edit mode;
 
   countries: any[] = [];
@@ -194,6 +195,9 @@ export class ReviewTraineeAddComponent implements OnInit {
               if(this.chosenDepartments[i].is_confirmed == 1){
                 this.formData.department4 = responce['data']['request'].departments[i].department_id;
               }
+              if(this.chosenDepartments[i].asked_for_opinion == '1') {
+                this.departmentNameOpinion = this.chosenDepartments[i].department_name;
+              }
             }
           }
 

src/app/dashboard/reivew-trainee-data/review-trainee-data-list/review-trainee-data-list.component.html

@@ -71,12 +71,11 @@
           <table class="table table-bordered">
               <thead class="headBackground-w">
                 <tr>
-                  <th>
+                  <!-- <th>
                     <div class="custom-control custom-checkbox">
                         <input type="checkbox" class="custom-control-input" [(ngModel)]="selectedAll" (change)="selectAll();" id="customCheck" name="example1">
-                        <!-- <label class="custom-control-label fixedWidthLabel-w checkAll-w" for="customCheck" style="margin-bottom:20px; cursor: pointer;"></label> -->
                     </div>
-                  </th>
+                  </th> -->
                   <th> إسم المتدرب</th>
                   <th>إسم التخصص</th>
                   <th>الجنسيه</th>
@@ -88,12 +87,11 @@
               </thead>
               <tbody>
                 <tr *ngFor="let data of dataList | paginate: { itemsPerPage: perPagePagenation, currentPage: currentPage, totalItems: count }; let i = index ">
-                  <td>
+                  <!-- <td>
                     <div class="custom-control custom-checkbox centerIneerItem">
                       <input type="checkbox" class="custom-control-input" id="{{data.id}}" [(ngModel)]="data.selected" [value]='data' (change)="checkIfAllSelected();">
-                      <!-- <label class="custom-control-label disblayBlock-w" for="{{news.id}}" style="color:#2a2a2a;cursor: pointer;"></label> -->
                     </div>
-                  </td>
+                  </td> -->
                   <td>{{data.trainee_name}}</td>
                   <td> {{data.specialization_name}}</td>
                   <td>{{data.country_arNationality}}</td>
@@ -114,8 +112,7 @@
                     : data.status == 'replayed_opinion' ? 'رأي القسم'
                     : data.status == 'refused' ? 'مرفوض' 
                     : data.status == 'canceled' ? 'ملغي'
-                    : data.status == 'asked_for_opinion' ? 'طلب رأي'
-                    : data.status == 'asked_for_opinion' ? 'طلب رأي' : 'لايوجد'}}</td>
+                    : data.status == 'asked_for_opinion' ? 'طلب رأي القسم' : 'لايوجد '}}</td>
                   <td *ngIf="authSer.showEditBtn"><button type="button" class="btn btn-outline-secondary" (click)="onEdit(data.id)"><i class="fas fa-edit"></i></button></td>
                 </tr>
               </tbody>

src/app/dashboard/section-review-for-trainee/section-review-trainee-add/section-review-trainee-add.component.css

@@ -222,7 +222,7 @@ select.ng-invalid{
 }
 
 .wrapper .iconUpload-w {
-    width: 265px;
+    width: 170px;
     height: 37px;
     border-radius: 5px;
     font-size: 1.25em;

src/app/dashboard/section-review-for-trainee/section-review-trainee-add/section-review-trainee-add.component.html

@@ -108,6 +108,15 @@
               <div class="row">
                 <div class="wrapper">
                   
+                  <div class="col-12">
+                    <h2>حاله الطلب : {{statusName == 'pending' ? 'تحت الإجراء' 
+                        : statusName == 'accepted' ? 'مقبول' 
+                        : statusName == 'replayed_opinion' ? 'رأي القسم'
+                        : statusName == 'refused' ? 'مرفوض' 
+                        : statusName == 'canceled' ? 'ملغي'
+                        : statusName == 'asked_for_opinion' ? 'طلب رأي القسم' : 'لايوجد '}}</h2>
+                  </div>
+
                   <div class="col-12 col-sm-12 col-md-4 col-lg-4">
                     <div class="form-group">
                       <label style="float:right">نوع الطلب <span class="spanReqired-w">*</span></label>
@@ -187,8 +196,7 @@
                     </div>
                   </div>
 
-                <!-- <h2 class="departmentHeading-w">أختر الأقسام <span>(قم بإختيار قسم كحد أدني)</span></h2> -->
-                  <div class="col-12 col-sm-12 col-md-4 col-lg-4">
+                  <!-- <div class="col-12 col-sm-12 col-md-4 col-lg-4">
                     <div class="form-group">
                       <label for="department1" style="float:right;">القسم الأول</label>
                       <select class="form-control selectStyle-w" id="department1" name="department1" (input)="changeDepartment($event , 1)" [(ngModel)]="formData.department1" [disabled]="disabledInput">
@@ -214,7 +222,7 @@
                         <option [value]="2003">حذف</option>
                       </select>
                     </div>
-                  </div>
+                  </div> -->
                 </div>
               </div>
             </div>
@@ -229,15 +237,16 @@
 
                 <div class="wrapper" *ngIf="files.length > 0">
                   
-                  <div class="col-12">
+                  <!-- <div class="col-12">
                     <button type="button" class="btn btn-default" (click)="plusImage()" style="margin:20px 0; float:right;">إضافه مرفق</button>
-                  </div>
+                  </div> -->
 
                   <table class="table table-bordered">
                     <thead class="headBackground-w">
                       <tr>
                         <th> إسم المرفق</th>
                         <th>رفع املف ( بصيغه pdf )</th>
+                        <th>عرض الملف</th>
                         <th>حذف</th>
                       </tr>
                     </thead>
@@ -249,6 +258,7 @@
                           <label for="file{{i}}" class="iconUpload-w"><i class="fas fa-upload"></i></label>
                           <span class="fileName-w">{{file.nameFile}}</span>
                         </td>
+                        <td><a href="{{authSer.pathImg + file.nameFile}}" target="_blank"><i class="fas fa-download"></i></a></td>
                         <td><button type="button" class="btn btn-danger form-control deleteRow-w" (click)="onDeleteRow(i)" [disabled]="disabledInput">حذف</button></td>
                       </tr>
                     </tbody>
@@ -259,51 +269,46 @@
             </div>
 
             <div class="col-12" style="margin: 20px 0;">
-                <div class="row">
-                  <div class="wrapper">
-                    
-                    <div class="askForOpinion-w" *ngIf="!isConfirmedStatus">
-                      <div class="col-12 col-md-12">
-                        <div class="form-group">
-                          <label style="float:right; margin: 20px;"> رأي القسم </label>
-                          <quill-editor id="description" name="actionOpinionForm" [(ngModel)]="actionOpinionForm.department_opinion" required>
-                            </quill-editor>
-                        </div>
+              <div class="row">
+                <div class="wrapper">
+                  
+                  <div class="askForOpinion-w" *ngIf="!isConfirmedStatus">
+                    <div class="col-12 col-md-12">
+                      <div class="form-group">
+                        <label style="float:right; margin: 20px;"> رأي القسم </label>
+                        <quill-editor id="description" name="actionOpinionForm" [(ngModel)]="actionOpinionForm.department_opinion" required>
+                          </quill-editor>
                       </div>
                     </div>
-                    
-                    <div class="confirmed-w" *ngIf="isConfirmedStatus">
-                      <div class="col-12 col-sm-12 col-md-4 col-lg-4">
-                          <div class="form-group">
-                            <label for="startDate" style="float:right" >تاريخ البدايه</label>
-                            <div *ngIf='bindingDateSplitStart && typeMode'>
-                              <app-higri-date (onDatePicked)="getDate($event, 'start')" [myDate]="bindingDateSplitStart"></app-higri-date>
-                            </div>
-                            <!-- <div *ngIf='!typeMode'>
-                              <app-higri-date (onDatePicked)="getDate($event, 'start')" ></app-higri-date>
-                            </div> -->
+                  </div>
+                  
+                  <div class="confirmed-w" *ngIf="isConfirmedStatus">
+                    <div class="col-12 col-sm-12 col-md-4 col-lg-4">
+                        <div class="form-group">
+                          <label for="startDate" style="float:right" >تاريخ البدايه</label>
+                          <div *ngIf='bindingDateSplitStart && typeMode'>
+                            <app-higri-date (onDatePicked)="getDate($event, 'start')" [myDate]="bindingDateSplitStart"></app-higri-date>
                           </div>
                         </div>
-          
-                        <div class="col-12 col-sm-12 col-md-4 col-lg-4">
-                          <div class="form-group">
-                            <label for="endDate" style="float:right" >تاريخ الإنتهاء</label>
-                            <div *ngIf='bindingDateSplitEnd && typeMode'>
-                              <app-end-higri-date  (onDatePicked)="getDate($event, 'end')" [myEndDate]="bindingDateSplitEnd"> </app-end-higri-date>
-                            </div>
-                            <!-- <div *ngIf='!typeMode'>
-                              <app-end-higri-date  (onDatePicked)="getDate($event, 'end')" ></app-end-higri-date>
-                            </div> -->
+                      </div>
+        
+                      <div class="col-12 col-sm-12 col-md-4 col-lg-4">
+                        <div class="form-group">
+                          <label for="endDate" style="float:right" >تاريخ الإنتهاء</label>
+                          <div *ngIf='bindingDateSplitEnd && typeMode'>
+                            <app-end-higri-date  (onDatePicked)="getDate($event, 'end')" [myEndDate]="bindingDateSplitEnd"> </app-end-higri-date>
                           </div>
                         </div>
+                      </div>
 
-                        <div class="col-12 col-sm-12 col-md-4 col-lg-4">
-                          <button class="btn btn-success" type="button" (click)="beginTrainning()" style="width: 100%; margin-top:30px;">بدء التدريب</button>
-                        </div>
-                    </div>
-                  
+                      <div class="col-12 col-sm-12 col-md-4 col-lg-4">
+                        <button class="btn btn-success" type="button" (click)="beginTrainning()" style="width: 100%; margin-top:30px;">بدء التدريب</button>
+                      </div>
+                      
                   </div>
+                
                 </div>
+              </div>
             </div>
 
             <div class="col-12">

src/app/dashboard/section-review-for-trainee/section-review-trainee-add/section-review-trainee-add.component.ts

@@ -46,6 +46,8 @@ export class SectionReviewTraineeAddComponent implements OnInit {
   bindingDateSplitStart;
   bindingDateSplitEnd;
 
+  statusName: string = '';
+
   @ViewChild('f') traineeForm: NgForm;
 
   //all form data 
@@ -200,6 +202,7 @@ export class SectionReviewTraineeAddComponent implements OnInit {
           this.formData.functional_number = responce['data']['request'].functional_number;
           this.formData.organization_affiliated_with = responce['data']['request'].organization_affiliated_with;
           this.formData.registration_number = responce['data']['request'].registration_number;
+          this.statusName = responce['data']['request'].status ? responce['data']['request'].status : '';
           this.userData.name = responce['data']['user'].name;
           this.userData.email = responce['data']['user'].email;
           this.userData.identity_number = responce['data']['user'].identity_number;