ff

src/app/External-Page/external-hospital/external-hospital.component.css

@@ -151,6 +151,16 @@
 
 
   
+  .btn-link {
+      width: 100%;
+      text-align: right;
+  }
+
+  .btn-link-en {
+    width: 100%;
+    text-align: left;
+    background-color: #00a99d;
+  }
 
 
 

src/app/External-Page/external-hospital/external-hospital.component.html

@@ -17,7 +17,7 @@
                                 <div *ngFor="let field of item['fields']" [attr.id]="'collapse'+(i+1)" class="collapse" [ngClass]="{'show' : (i+1) == 1}" [attr.aria-labelledby]="'heading' + (i+1)" data-parent="#accordion">
                                   <div class="card-body testBody-w">
                                       <ul class="list-unstyled">
-                                        <li (click)="showDescriptionDetails(field)"  [className]=" authSer.arabicTemplate ? '' : 'achievementsLangHeading-w' " style="text-align:right;margin-right:-23px">
+                                        <li (click)="showDescriptionDetails(field)" [className]=" authSer.arabicTemplate ? '' : 'achievementsLangHeading-w' " style="text-align:right;margin-right:-23px">
                                             {{field.title}}
                                         </li>
                                       </ul>
@@ -44,11 +44,11 @@
                               <div id="accordion">
                                   <div class="card" *ngFor="let item of data; let i = index">
                                       <div class="card-header" [attr.id]="'heading'+(i+1)">
-                                      <h5 class="mb-0">
-                                          <button class="btn btn-link" data-toggle="collapse" [attr.data-target]="'#collapse'+(i+1)" [attr.aria-expanded]="(i+1)==1 ? true :false" [attr.aria-controls]="'collapse'+(i+1)">
-                                          <h4 class="panel-title">{{item.name_en}}</h4>
-                                          </button>
-                                      </h5>
+                                        <h5 class="mb-0">
+                                            <button class="btn btn-link-en" data-toggle="collapse" [attr.data-target]="'#collapse'+(i+1)" [attr.aria-expanded]="(i+1)==1 ? true :false" [attr.aria-controls]="'collapse'+(i+1)">
+                                            <h4 class="panel-title">{{item.name_en}}</h4>
+                                            </button>
+                                        </h5>
                                       </div>
                                   
                                       <div *ngFor="let field of item['fields']" [attr.id]="'collapse'+(i+1)" class="collapse" [ngClass]="{'show' : (i+1) == 1}" [attr.aria-labelledby]="'heading' + (i+1)" data-parent="#accordion">

src/app/External-Page/external-managaments/external-managaments.component.css

@@ -43,6 +43,17 @@
     background-color: #f3f3f3;
 }
 
+.btn-link {
+    width: 100%;
+    text-align: right;
+}
+
+.btn-link-en {
+  width: 100%;
+  text-align: left;
+  background-color: #00a99d;
+}
+
 @media(max-width: 767px) {
     .hospitalContent-w .card-body ul li {
         font-size: 13px;

src/app/dashboard/advertisiment/advertisiment.component.ts

@@ -56,8 +56,9 @@ export class AdvertisimentComponent implements OnInit {
 
       this.route.params.subscribe(
         (parmas: Params) => {
-          this.pageId = parmas['listPageId'];
+          this.pageId = parmas['adverId'];
           localStorage.setItem('pageIdActive', '24');
+          alert(this.pageId);
         }
       );
       

src/app/dashboard/register-movement-vehicle/register-movement-vehicle-add/register-movement-vehicle-add.component.html

@@ -19,7 +19,7 @@
 
               <div class="col-12 col-sm-12 col-md-4">
                 <div class="form-group">
-                  <label for="vehicle_type_id" style="float: right; margin-right: 5px">صنف المركبه</label>
+                  <label for="vehicle_type_id" style="float: right; margin-right: 5px">صنف المركبه <span class="spanReqired-w">*</span></label>
                   <select class="form-control" name="vehicle_type_id" (input)="onChangeVehicleType($event)" [disabled]="checkEdit" [(ngModel)]="formData.vehicle_type_id" required>
                     <option *ngFor="let type of vehicle_types" [value]="type.id">{{type.name}}</option>
                   </select>
@@ -28,7 +28,7 @@
 
               <div class="col-12 col-sm-12 col-md-4" *ngIf='show'>
                   <div class="form-group">
-                    <label for="vehicle_id" style="float: right; margin-right: 5px"> رقم اللوحات</label>
+                    <label for="vehicle_id" style="float: right; margin-right: 5px"> رقم اللوحات <span class="spanReqired-w">*</span></label>
                     <select class="form-control" name="vehicle_id" [(ngModel)]="formData.vehicle_id" [disabled]="checkEdit" required>
                       <option *ngFor="let num of licenseNum" [value]="num.id">{{num.plate_number}}</option>
                     </select>
@@ -37,14 +37,14 @@
 
               <div class="col-12 col-sm-12 col-md-4">
                 <div class="form-group">
-                   <label for="vehicle_recipient_name" style="float: right; margin-right: 5px">إسم الموظف</label>
+                   <label for="vehicle_recipient_name" style="float: right; margin-right: 5px">إسم الموظف <span class="spanReqired-w">*</span></label>
                    <input type="text" class="form-control" placeholder="إسم الموظف" name="vehicle_recipient_name" id="vehicle_recipient_name" [(ngModel)]="formData.vehicle_recipient_name" ngModel required />
                 </div>
               </div>
 
               <div class="col-12 col-sm-12 col-md-4">
                 <div class="form-group">
-                    <label for="phone" style="float: right; margin-right: 5px">الجوال</label>
+                    <label for="phone" style="float: right; margin-right: 5px">الجوال  <span class="spanReqired-w">*</span> </label>
                     <input type="text" class="form-control" placeholder="الهاتف" name="phone" id="phone" appOnlyNumber [(ngModel)]="formData.phone" ngModel required />
                 </div>
               </div>
@@ -92,14 +92,14 @@
                       </div>
               <div class="col-12 col-sm-12 col-md-4">
                 <div class="form-group">
-                    <label for="start_mileage_recording" style="float: right; margin-right: 5px">تسجيل عدد الكيلومترات البداية</label>
+                    <label for="start_mileage_recording" style="float: right; margin-right: 5px">تسجيل عدد الكيلومترات البداية <span class="spanReqired-w">*</span></label>
                     <input type="number" class="form-control" placeholder="تسجيل عدد الكيلومترات البداية" name="start_mileage_recording" id="start_mileage_recording" [(ngModel)]="formData.start_mileage_recording" ngModel required />
                 </div>
               </div>
 
               <div class="col-12 col-sm-12 col-md-4">
                 <div class="form-group">
-                    <label for="end_mileage_recording" style="float: right; margin-right: 5px">تسجيل عدد الكيلومترات للنهاية</label>
+                    <label for="end_mileage_recording" style="float: right; margin-right: 5px">تسجيل عدد الكيلومترات للنهاية <span class="spanReqired-w">*</span></label>
                     <input type="number" class="form-control" placeholder="تسجيل عدد الكيلومترات للنهاية" name="end_mileage_recording" id="end_mileage_recording" [(ngModel)]="formData.end_mileage_recording" ngModel required />
                 </div>
               </div>

src/app/dashboard/vehicle-maintenance/vehicle-maintenance-add/vehicle-maintenance-add.component.ts

@@ -238,6 +238,7 @@ export class VehicleMaintenanceAddComponent implements OnInit {
 
     delete this.vehicleForm.value['vehicle_type_id'];
 
+    console.log(this.vehicleForm.value);
     console.log(this.formData);
 
     const startDateData = this.startDate.split('-');
@@ -254,7 +255,10 @@ export class VehicleMaintenanceAddComponent implements OnInit {
         this.toastr.warning(' يوم تاريخ الإنتهاء يجب أن يكون أكبر من يوم تاريخ الإبتداء!');
         this.checkSaveclick = false;
       } else {
-        this.dashBoardSer.editItem(this.maintenanceVehicleId,this.formData, 'vehicleMaintenance').subscribe(
+        this.vehicleForm.value['vehicle_id'] = this.formData.vehicle_id;
+        this.vehicleForm.value['vehicle_type_id'] = this.formData.vehicle_type_id;
+        console.log('===========================>', this.vehicleForm.value);
+        this.dashBoardSer.editItem(this.maintenanceVehicleId, this.vehicleForm.value, 'vehicleMaintenance').subscribe(
           (responce) => {
             console.log(responce);
             this.toastr.success('تم التعديل بنجاح');

src/styles.css

@@ -964,7 +964,7 @@ height: 7px !important;
 	direction: ltr;
 }
 .btn-link{
-	    color: #8c6a40 !important;
+      color: #8c6a40 !important;
 }
 .ngb-dp-weekday{
 	    color: #af6204 !important;