Pārlūkot izejas kodu

all except regester

Hima 5 gadi atpakaļ
vecāks
revīzija
1436f94a92
25 mainītis faili ar 62 papildinājumiem un 47 dzēšanām
  1. 4 4
      src/app/Internal-Page/internal-page-header/internal-page-header.component.html
  2. 1 1
      src/app/Internal-Page/internal-page-header/internal-page-header.component.ts
  3. 1 0
      src/app/app.module.ts
  4. 2 2
      src/app/dashboard/achievements/achievement-list/achievement.component.css
  5. 2 2
      src/app/dashboard/advertisiment/advertisiment.component.css
  6. 2 2
      src/app/dashboard/department/department-list/department-list.component.css
  7. 2 2
      src/app/dashboard/events/events.component.css
  8. 2 2
      src/app/dashboard/external-services/external-list/external-list.component.css
  9. 2 2
      src/app/dashboard/footer/footer-list/footer-list.component.css
  10. 4 0
      src/app/dashboard/header/header.component.css
  11. 2 2
      src/app/dashboard/header/header.component.html
  12. 2 2
      src/app/dashboard/hospitals/hospital-list/hospital-list.component.css
  13. 2 2
      src/app/dashboard/internal-services/internal-services.component.css
  14. 2 2
      src/app/dashboard/lectures/lectures-list/lectures-list.component.css
  15. 2 2
      src/app/dashboard/main-menu/main-list/main-list.component.css
  16. 2 2
      src/app/dashboard/news/news-list/news-list.component.css
  17. 2 2
      src/app/dashboard/roles/roles-list/roles-list.component.css
  18. 2 2
      src/app/dashboard/sections/section-list/section-list.component.css
  19. 2 2
      src/app/dashboard/tabs/tab-list/tab-list.component.css
  20. 2 2
      src/app/dashboard/users/users.component.css
  21. 0 2
      src/app/higri-date/higri-date.component.html
  22. 0 2
      src/app/higri-date/higri-date.component.ts
  23. 4 4
      src/app/regester/regester.component.html
  24. 3 2
      src/app/regester/regester.component.ts
  25. 13 0
      src/styles.css

+ 4 - 4
src/app/Internal-Page/internal-page-header/internal-page-header.component.html

@@ -52,12 +52,12 @@
                         <input type="text" placeholder="أبحث"/><button class="searchBtn" style="cursor: pointer;"><i class="fas fa-search"></i></button>
                     </div>
                 </div>
-                <div class="col-2 col-sm-2 col-md-4 col-lg-4 d-none d-sm-none d-md-block d-lg-block">
+                <div class="col-2 col-sm-2 col-md-4 col-lg-4 d-none d-sm-none d-md-block d-lg-block leftText">
                     <p class="dateW"> {{currentDate}}</p>
                     <span class="ar" (click)="authSer.onLanguageContent('ar')" [ngClass]="{'activeLanguage':authSer. arabicLanguage}" *ngIf="authSer.showArabicIcon">Aa</span>
                     <span class="en" (click)="authSer.onLanguageContent('en')" [ngClass]="{'activeLanguage': authSer.englishLanguage}" *ngIf="authSer.showEnglishIcon">En</span>
                 </div>
-                <div class="col-2 col-sm-2 col-md-4 col-lg-4 d-md-none d-lg-none">
+                <div class="col-2 col-sm-2 col-md-4 col-lg-4 d-md-none d-lg-none leftText">
                     <span class="ar" (click)="authSer.onLanguageContent('ar')" [ngClass]="{'activeLanguage':authSer. arabicLanguage}" *ngIf="authSer.showArabicIcon">Aa</span>
                     <span class="en" (click)="authSer.onLanguageContent('en')" [ngClass]="{'activeLanguage': authSer.englishLanguage}" *ngIf="authSer.showEnglishIcon">En</span>
                 </div>
@@ -213,12 +213,12 @@
                         <input type="text" placeholder="search" style=" text-align:left"/><button class="searchBtn" style="cursor: pointer;"><i class="fas fa-search"></i></button>
                     </div>
                 </div>
-                <div class="col-2 col-sm-2 col-md-4 col-lg-4  d-none d-sm-none d-md-block d-lg-block">
+                <div class="col-2 col-sm-2 col-md-4 col-lg-4  d-none d-sm-none d-md-block d-lg-block leftText">
                     <p class="dateW"> {{currentEnglishDate | date:'fullDate'}} </p>
                     <span class="ar" (click)="authSer.onLanguageContent('ar')" [ngClass]="{'activeLanguage':authSer.arabicLanguage}" *ngIf="authSer.showArabicIcon">عربي</span>
                     <span class="en" (click)="authSer.onLanguageContent('en')" [ngClass]="{'activeLanguage': authSer.englishLanguage}" *ngIf="authSer.showEnglishIcon">En</span>
                 </div>
-                <div class="col-2 col-sm-2 col-md-4 col-lg-4 d-md-none d-lg-none">
+                <div class="col-2 col-sm-2 col-md-4 col-lg-4 d-md-none d-lg-none leftText">
                     <span class="ar" (click)="authSer.onLanguageContent('ar')" [ngClass]="{'activeLanguage':authSer.arabicLanguage}" *ngIf="authSer.showArabicIcon">عربي</span>
                     <span class="en" (click)="authSer.onLanguageContent('en')" [ngClass]="{'activeLanguage': authSer.englishLanguage}" *ngIf="authSer.showEnglishIcon">En</span>
                 </div>

+ 1 - 1
src/app/Internal-Page/internal-page-header/internal-page-header.component.ts

@@ -68,7 +68,7 @@ export class InternalPageHeaderComponent implements OnInit {
   }
 
   onDashBoard() {
-    this.router.navigate(['dashboard/' + this.authSer.dataLoginUser['id']]);
+    this.router.navigate(['services/' + this.authSer.dataLoginUser['id']]);
   }
 
   goToHome() {

+ 1 - 0
src/app/app.module.ts

@@ -51,6 +51,7 @@ import { adapterFactory } from 'angular-calendar/date-adapters/date-fns';
 
 import { BootstrapModalModule } from 'ngx-modialog/plugins/bootstrap';
 import { JwSocialButtonsModule } from 'jw-angular-social-buttons';
+
 //import { CeiboShare } from 'ng2-social-share';
 
 

+ 2 - 2
src/app/dashboard/achievements/achievement-list/achievement.component.css

@@ -23,8 +23,8 @@
     display: block;
 }
 
-.centerIneerItem {
+/* .centerIneerItem {
     display: flex;
     justify-content: center;
     text-align: center;
-}
+} */

+ 2 - 2
src/app/dashboard/advertisiment/advertisiment.component.css

@@ -23,8 +23,8 @@
     display: block;
 }
 
-.centerIneerItem {
+/* .centerIneerItem {
     display: flex;
     justify-content: center;
     text-align: center;
-}
+} */

+ 2 - 2
src/app/dashboard/department/department-list/department-list.component.css

@@ -23,8 +23,8 @@
     display: block;
 }
 
-.centerIneerItem {
+/* .centerIneerItem {
     display: flex;
     justify-content: center;
     text-align: center;
-}
+} */

+ 2 - 2
src/app/dashboard/events/events.component.css

@@ -23,8 +23,8 @@
     display: block;
 }
 
-.centerIneerItem {
+/* .centerIneerItem {
     display: flex;
     justify-content: center;
     text-align: center;
-}
+} */

+ 2 - 2
src/app/dashboard/external-services/external-list/external-list.component.css

@@ -23,8 +23,8 @@
     display: block;
 }
 
-.centerIneerItem {
+/* .centerIneerItem {
     display: flex;
     justify-content: center;
     text-align: center;
-}
+} */

+ 2 - 2
src/app/dashboard/footer/footer-list/footer-list.component.css

@@ -23,8 +23,8 @@
     display: block;
 }
 
-.centerIneerItem {
+/* .centerIneerItem {
     display: flex;
     justify-content: center;
     text-align: center;
-}
+} */

+ 4 - 0
src/app/dashboard/header/header.component.css

@@ -211,6 +211,10 @@ background-color: #f1f1f1;
     margin-top: 15px;
 }
 
+.bottomHeader-w .leftLogo-w {
+    text-align: left;
+}
+
 .bottomHeader-w .leftLogo-w img {
     margin-top: 15px;
 }

+ 2 - 2
src/app/dashboard/header/header.component.html

@@ -44,10 +44,10 @@
                                 <i class="fas fa-tasks"></i>
                                 <span>مهامي</span>
                                 </button>
-                                <!-- <button class="dropdown-item" style="cursor: pointer;" (click)="onInternalPage()">
+                                <button class="dropdown-item" style="cursor: pointer;" (click)="onInternalPage()">
                                     <i class="fas fa-solar-panel"></i>
                                     <span> البوابه الداخليه</span>
-                                </button> -->
+                                </button>
                                 <button class="dropdown-item" style="cursor: pointer;color: #da0b0b !important;background-color: #f3f3f3;border-radius: 4px;" (click)="onLogout()">
                                     <i class="fas fa-sign-out-alt" style="color: #da0b0b !important;"></i>
                                     <span>خروج</span>

+ 2 - 2
src/app/dashboard/hospitals/hospital-list/hospital-list.component.css

@@ -23,8 +23,8 @@
     display: block;
 }
 
-.centerIneerItem {
+/* .centerIneerItem {
     display: flex;
     justify-content: center;
     text-align: center;
-}
+} */

+ 2 - 2
src/app/dashboard/internal-services/internal-services.component.css

@@ -23,8 +23,8 @@
     display: block;
 }
 
-.centerIneerItem {
+/* .centerIneerItem {
     display: flex;
     justify-content: center;
     text-align: center;
-}
+} */

+ 2 - 2
src/app/dashboard/lectures/lectures-list/lectures-list.component.css

@@ -23,8 +23,8 @@
     display: block;
 }
 
-.centerIneerItem {
+/* .centerIneerItem {
     display: flex;
     justify-content: center;
     text-align: center;
-}
+} */

+ 2 - 2
src/app/dashboard/main-menu/main-list/main-list.component.css

@@ -22,9 +22,9 @@
 .disblayBlock-w {
     display: block;
 }
-
+/* 
 .centerIneerItem {
     display: flex;
     justify-content: center;
     text-align: center;
-}
+} */

+ 2 - 2
src/app/dashboard/news/news-list/news-list.component.css

@@ -23,8 +23,8 @@
     display: block;
 }
 
-.centerIneerItem {
+/* .centerIneerItem {
     display: flex;
     justify-content: center;
     text-align: center;
-}
+} */

+ 2 - 2
src/app/dashboard/roles/roles-list/roles-list.component.css

@@ -23,8 +23,8 @@
     display: block;
 }
 
-.centerIneerItem {
+/* .centerIneerItem {
     display: flex;
     justify-content: center;
     text-align: center;
-}
+} */

+ 2 - 2
src/app/dashboard/sections/section-list/section-list.component.css

@@ -23,8 +23,8 @@
     display: block;
 }
 
-.centerIneerItem {
+/* .centerIneerItem {
     display: flex;
     justify-content: center;
     text-align: center;
-}
+} */

+ 2 - 2
src/app/dashboard/tabs/tab-list/tab-list.component.css

@@ -23,8 +23,8 @@
     display: block;
 }
 
-.centerIneerItem {
+/* .centerIneerItem {
     display: flex;
     justify-content: center;
     text-align: center;
-}
+} */

+ 2 - 2
src/app/dashboard/users/users.component.css

@@ -23,11 +23,11 @@
     display: block;
 }
 
-.centerIneerItem {
+/* .centerIneerItem {
     display: flex;
     justify-content: center;
     text-align: center;
-}
+} */
 
 
 @media(max-width: 767px) {

+ 0 - 2
src/app/higri-date/higri-date.component.html

@@ -9,5 +9,3 @@
     <button class="btn btn-outline-secondary calendar" (click)="d.toggle()" type="button"><i class="fas fa-calendar-minus"></i></button>
 </div>
 
-
-

+ 0 - 2
src/app/higri-date/higri-date.component.ts

@@ -10,8 +10,6 @@ const MONTHS = ['محرم', 'صفر', 'ربيع الأول', 'ربيع الآخ
 
   @Injectable()
   export class IslamicI18n extends NgbDatepickerI18n {
-    
-
     getWeekdayShortName(weekday: number) {
       return WEEKDAYS[weekday - 1];
     }

+ 4 - 4
src/app/regester/regester.component.html

@@ -130,17 +130,17 @@
               </div>
             </div>
 
-            <!-- <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="date_employment_hij" style="float:right">تاريخ التوظيف الهجري <span class="spanReqired-w">*</span></label>
-                <div *ngIf='bindingDateSplit && typeMode'>
+                <!-- <div *ngIf='bindingDateSplit && typeMode'>
                   <app-higri-date (onDatePicked)="getDate($event)" [myDate]="bindingDateSplit"></app-higri-date>
                 </div>
                 <div *ngIf='!typeMode'>
                   <app-higri-date (onDatePicked)="getDate($event)" ></app-higri-date>
-                </div>
+                </div> -->
               </div>
-            </div> -->
+            </div>
 
             <div class="col-12 col-sm-12 col-md-6 col-lg-4">
               <div class="form-group">

+ 3 - 2
src/app/regester/regester.component.ts

@@ -2,16 +2,17 @@ import { Modal } from 'ngx-modialog/plugins/bootstrap';
 import { Observable } from 'rxjs/Observable';
 import { AuthServiceService } from './../shared/auth-service.service';
 import { UserService } from './../shared/user.service';
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, Injectable } from '@angular/core';
 import { NgForm, FormGroup, FormControl, Validators } from '@angular/forms';
 import { Router, ActivatedRoute, Params } from '@angular/router';
 import { ToastrService } from 'ngx-toastr';
 import { NgxSpinnerService } from 'ngx-spinner';
 
+
 @Component({
   selector: 'app-regester',
   templateUrl: './regester.component.html',
-  styleUrls: ['./regester.component.css']
+  styleUrls: ['./regester.component.css'],
 })
 
 

+ 13 - 0
src/styles.css

@@ -330,6 +330,7 @@ input:-webkit-autofill:active  {
   }
   .headBackground-w th {
     border: 1px solid #fff;
+    text-align: center;
   }
 
   .table tbody tr:nth-child(even){
@@ -351,6 +352,13 @@ input:-webkit-autofill:active  {
   }
 
   .table tbody tr:hover {background-color: #cec8c0;color: #fff}
+
+  .table .custom-control-input {
+    opacity: 1;
+    z-index: 1;
+    width: 20px;
+    height: 20px;
+  }
 /*
   .table{
     border: 2px solid #ecdcc7;
@@ -367,6 +375,7 @@ input:-webkit-autofill:active  {
 table .btn{
 	    border: 0px solid transparent !important;
     padding: 0px 8px !important;
+    cursor: pointer;
 }
   .checkAll-w::before {
     background-color: #fff;
@@ -884,6 +893,10 @@ height: 7px !important;
 }
 
 
+.leftText {
+  text-align: left;
+}
+