Hima 5 years ago
parent
commit
68401cb47c
28 changed files with 2467 additions and 85 deletions
  1. 30 0
      bower_components/hijrah-date/.bower.json
  2. 21 0
      bower_components/hijrah-date/LICENSE
  3. 141 0
      bower_components/hijrah-date/README.md
  4. 19 0
      bower_components/hijrah-date/bower.json
  5. 50 0
      bower_components/hijrah-date/gulpfile.js
  6. 1873 0
      bower_components/hijrah-date/hijrah-date.js
  7. 2 0
      bower_components/hijrah-date/hijrah-date.min.js
  8. 1 0
      bower_components/hijrah-date/hijrah-date.min.js.map
  9. 69 0
      bower_components/hijrah-date/karma.conf.js
  10. 38 0
      bower_components/hijrah-date/package.json
  11. 5 0
      package-lock.json
  12. 1 0
      package.json
  13. 53 2
      src/app/External-Page/external-page-content/external-page-content.component.css
  14. 65 35
      src/app/External-Page/external-page-content/external-page-content.component.html
  15. 3 3
      src/app/External-Page/external-page-content/external-page-content.component.ts
  16. 2 2
      src/app/auth-services/regester/regester.component.html
  17. 14 4
      src/app/auth-services/regester/regester.component.ts
  18. 1 0
      src/app/dashboard/dashboard-routing.ts
  19. 2 0
      src/app/dashboard/external-services/add-external/add-external.component.html
  20. 0 2
      src/app/dashboard/lectures/lectures-list/lectures-list.component.html
  21. 2 5
      src/app/dashboard/users/form-user/form-user.component.ts
  22. 2 0
      src/app/dashboard/vehicle-maintenance/vehicle-maintenance-list/vehicle-maintenance-list.component.css
  23. 13 1
      src/app/dashboard/visiting-times/add-visiting-time/add-visiting-time.component.ts
  24. 30 0
      src/app/dashboard/visiting-times/visiting-times-list/visiting-times-list.component.css
  25. 19 22
      src/app/dashboard/visiting-times/visiting-times-list/visiting-times-list.component.html
  26. 8 8
      src/app/dashboard/visiting-times/visiting-times-list/visiting-times-list.component.ts
  27. 1 1
      src/app/shared/auth-service.service.ts
  28. 2 0
      src/app/shared/dashboard.service.ts

+ 30 - 0
bower_components/hijrah-date/.bower.json

@@ -0,0 +1,30 @@
+{
+  "name": "hijrah-date",
+  "version": "1.0.3",
+  "description": "A date in the Hijrah calendar system",
+  "main": "hijrah-date.js",
+  "keywords": "date, hijrah, hijri, calendar, islamic",
+  "author": "Mouaffak A. Sarhan <mouffaksarhan@gmail.com>",
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/msarhan/hijrah-date.git"
+  },
+  "ignore": [
+    "**/.*",
+    "node_modules",
+    "test",
+    "src"
+  ],
+  "homepage": "https://github.com/msarhan/hijrah-date",
+  "_release": "1.0.3",
+  "_resolution": {
+    "type": "version",
+    "tag": "1.0.3",
+    "commit": "fcef5a2f8f88d71f697e28dc9d26114ac016fa60"
+  },
+  "_source": "https://github.com/msarhan/hijrah-date.git",
+  "_target": "^1.0.3",
+  "_originalSource": "hijrah-date",
+  "_direct": true
+}

+ 21 - 0
bower_components/hijrah-date/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2016 Mouaffak A. Sarhan
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

+ 141 - 0
bower_components/hijrah-date/README.md

@@ -0,0 +1,141 @@
+# HijrahDate [![Build Status](https://travis-ci.org/msarhan/hijrah-date.svg?branch=master)](https://travis-ci.org/msarhan/hijrah-date)
+Javascript date in the Hijrah calendar system.
+
+
+## Install
+
+You can install this package either with `npm` or with `bower`.
+
+### npm
+
+```shell
+npm install hijrah-date
+```
+
+### bower
+
+```shell
+bower install hijrah-date
+```
+
+Then add a `<script>` to your `index.html`:
+
+```html
+<script src="/bower_components/hijrah-date/hijrah-date.js"></script>
+```
+
+## Usage
+### Creating new instance
+```js
+new HijrahDate();
+new HijrahDate(year, month[, day[, hour[, minutes[, seconds[, milliseconds]]]]]);
+```
+```js
+var hijrahDate1 = new HijrahDate();
+var hijrahDate2 = new HijrahDate(1437, 11, 10);
+var hijrahDate3 = new HijrahDate(1437, 11, 10, 14, 40);
+```
+
+### Read methods
+Most of native `Date`'s read methods are available in HijrahDate
+```js
+var hijrahDate = new HijrahDate(1437, 11, 14, 15, 50, 21, 456);
+hijrahDate.getTime()			// 1473943821456
+hijrahDate.getFullYear()		// 1437
+hijrahDate.getMonth()			// 11
+hijrahDate.getDate()			// 14
+hijrahDate.getDay()				// 4
+hijrahDate.getHours()			// 15
+hijrahDate.getMinutes()			// 50
+hijrahDate.getSeconds()			// 21
+hijrahDate.getMilliseconds()	// 456
+
+hijrahDate.getMonthLength()		// 30
+hijrahDate.getYearLength()		// 354
+hijrahDate.getDayOfYear()		// 338
+hijrahDate.isLeapYear()			// false
+hijrahDate.toEpochDay()			// 17055
+```
+
+### Manipulate
+```js
+HijrahDate::plusYears(yearsToAdd)
+HijrahDate::plusMonths(monthsToAdd)
+HijrahDate::plusWeeks(weeksToAdd)
+HijrahDate::plusDays(daysToAdd)
+
+HijrahDate::minusYears(yearsToSubtract)
+HijrahDate::minusMonths(monthsToSubtract)
+HijrahDate::minusWeeks(weeksToSubtract)
+HijrahDate::minusDays(daysToSubtract)
+```
+Example
+```js
+var hijrahDate = new HijrahDate(1437, 11, 10);
+var hijrahDate2 = hd.plusYears(1)
+	.plusMonths(2)
+	.plusDays(5);
+```
+
+### Conversion
+#### `HijrahDate` To `Date`
+Using `HijrahDate::toGregorian` function
+```js
+var hijrahDate = new HijrahDate(1437, 11, 10, 14, 40, 23, 15);
+var date = hd.toGregorian();
+```
+
+#### `Date` To `HijrahDate`
+```js
+var date = new Date(2016, 9, 23);
+var hijrahDate = new HijrahDate(date);
+```
+
+### Format
+`HijrahDate::format(format[, localeId])`
+
+Formats `HijrahDate` to a string based on the requested format. Formats ported from [AngularJS' date filter](https://docs.angularjs.org/api/ng/filter/date).
+
+`localeId` string 'en' or 'ar'
+
+`format` string can be composed of the following elements:
+* 'yyyy': 4 digit representation of year (e.g. 1437)
+* 'yy': 2 digit representation of year, padded (00-99). (e.g. 1330 => 30, 1437 => 37)
+* 'y': 1 digit representation of year, e.g. (1330 => 1330, AD 1438 => 1438)
+* 'MMMM': Month in year (Muharram-Dhuʻl-Hijjah)
+* 'MMM': Month in year (Muh-Dhuʻl-H)
+* 'MM': Month in year, padded (01-12)
+* 'M': Month in year (1-12)
+* 'LLLL': Stand-alone month in year (Muharram-Dhuʻl-Hijjah)
+* 'dd': Day in month, padded (01-30)
+* 'd': Day in month (1-30)
+* 'EEEE': Day in Week,(Sunday-Saturday)
+* 'EEE': Day in Week, (Sun-Sat)
+* 'HH': Hour in day, padded (00-23)
+* 'H': Hour in day (0-23)
+* 'hh': Hour in AM/PM, padded (01-12)
+* 'h': Hour in AM/PM, (1-12)
+* 'mm': Minute in hour, padded (00-59)
+* 'm': Minute in hour (0-59)
+* 'ss': Second in minute, padded (00-59)
+* 's': Second in minute (0-59)
+* 'sss': Millisecond in second, padded (000-999)
+* 'a': AM/PM marker
+* 'Z': 4 digit (+sign) representation of the timezone offset (-1200-+1200)
+* 'ww': Week of year, padded (00-53). Week 01 is the week with the first Thursday of the year
+* 'w': Week of year (0-53). Week 1 is the week with the first Thursday of the year
+* 'G', 'GG', 'GGG': The abbreviated form of the era string (e.g. 'AD')
+* 'GGGG': The long form of the era string (e.g. 'Anno Hegirae')
+
+format string can also be one of the following predefined localizable formats:
+
+* 'medium': equivalent to 'MMM d, y h:mm:ss a' for en_US locale (e.g. Muh 3, 1437 12:05:08 PM)
+* 'short': equivalent to 'M/d/yy h:mm a' for en_US locale (e.g. 9/3/37 12:05 PM)
+* 'fullDate': equivalent to 'EEEE, MMMM d, y' for en_US locale (e.g. Friday, Ramadan 24, 1431)
+* 'longDate': equivalent to 'MMMM d, y' for en_US locale (e.g. Ramadan 3, 1437)
+* 'mediumDate': equivalent to 'MMM d, y' for en_US locale (e.g. Ram 3, 1437)
+* 'shortDate': equivalent to 'M/d/yy' for en_US locale (e.g. 9/3/37)
+* 'mediumTime': equivalent to 'h:mm:ss a' for en_US locale (e.g. 12:05:08 PM)
+* 'shortTime': equivalent to 'h:mm a' for en_US locale (e.g. 12:05 PM)
+
+format string can contain literal values. These need to be escaped by surrounding with single quotes (e.g. "h 'in the morning'"). In order to output a single quote, escape it - i.e., two single quotes in a sequence (e.g. "h 'o''clock'").

+ 19 - 0
bower_components/hijrah-date/bower.json

@@ -0,0 +1,19 @@
+{
+  "name": "hijrah-date",
+  "version": "1.0.3",
+  "description": "A date in the Hijrah calendar system",
+  "main": "hijrah-date.js",
+  "keywords": "date, hijrah, hijri, calendar, islamic",
+  "author": "Mouaffak A. Sarhan <mouffaksarhan@gmail.com>",
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/msarhan/hijrah-date.git"
+  },
+  "ignore": [
+    "**/.*",
+    "node_modules",
+    "test",
+    "src"
+  ]
+}

+ 50 - 0
bower_components/hijrah-date/gulpfile.js

@@ -0,0 +1,50 @@
+'use strict';
+var gulp = require('gulp');
+var concat = require('gulp-concat');
+var uglify = require('gulp-uglify');
+var sourcemaps = require('gulp-sourcemaps');
+var rename = require('gulp-rename');
+var wrap = require('gulp-wrap');
+var Server = require('karma').Server;
+
+var src = [
+	'./src/utils.js',
+	'./src/locale/*.js',
+	'./src/HijrahDateFormatter.js',
+	'./src/HijrahDate.js'
+];
+var dest = '.'
+var file = './hijrah-date.js';
+var minFile = './hijrah-date.min.js';
+
+var wrapTemplate = "(function (global, factory) {"+
+						"typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :"+
+						"typeof define === 'function' && define.amd ? define(factory) :"+
+						"global.HijrahDate = factory()"+
+					"}(this, function(){ 'use strict';<%= contents %>; return HijrahDate;}));"
+
+gulp.task('concat', function() {
+	return gulp.src(src)
+		.pipe(concat(file))
+		.pipe(gulp.dest(dest))
+		.pipe(wrap(wrapTemplate, {}, {parse: false}))
+		.pipe(gulp.dest(dest))
+});
+
+gulp.task('test', ['concat'], function (done) {
+  new Server({
+    configFile: __dirname + '/karma.conf.js',
+    singleRun: true
+  }, done).start();
+});
+
+gulp.task('build', ['concat'], function() {
+	return gulp.src(file)
+		.pipe(sourcemaps.init())
+		.pipe(rename(minFile))
+		.pipe(uglify({strict:true}))
+		.pipe(sourcemaps.write(dest))
+		.pipe(gulp.dest(dest));
+});
+
+gulp.task('default', ['test', 'build']);

File diff suppressed because it is too large
+ 1873 - 0
bower_components/hijrah-date/hijrah-date.js


File diff suppressed because it is too large
+ 2 - 0
bower_components/hijrah-date/hijrah-date.min.js


File diff suppressed because it is too large
+ 1 - 0
bower_components/hijrah-date/hijrah-date.min.js.map


+ 69 - 0
bower_components/hijrah-date/karma.conf.js

@@ -0,0 +1,69 @@
+module.exports = function(config) {
+  config.set({
+
+    // base path that will be used to resolve all patterns (eg. files, exclude)
+    basePath: '',
+
+
+    // frameworks to use
+    // available frameworks: https://npmjs.org/browse/keyword/karma-adapter
+    frameworks: ['jasmine'],
+
+
+    // list of files / patterns to load in the browser
+    files: [
+      'node_modules/timeshift-js/timeshift.js',
+      'hijrah-date.js',
+      'test/HijrahDate.spec.js',
+      'test/HijrahDateFormatter.spec.js'
+    ],
+
+
+    // list of files to exclude
+    exclude: [
+    ],
+
+
+    // preprocess matching files before serving them to the browser
+    // available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor
+    preprocessors: {
+    },
+
+
+    // test results reporter to use
+    // possible values: 'dots', 'progress'
+    // available reporters: https://npmjs.org/browse/keyword/karma-reporter
+    reporters: ['progress'],
+
+
+    // web server port
+    port: 9876,
+
+
+    // enable / disable colors in the output (reporters and logs)
+    colors: true,
+
+
+    // level of logging
+    // possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG
+    logLevel: config.LOG_INFO,
+
+
+    // enable / disable watching file and executing tests whenever any file changes
+    autoWatch: true,
+
+
+    // start these browsers
+    // available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
+    browsers: ['PhantomJS'],
+
+
+    // Continuous Integration mode
+    // if true, Karma captures browsers, runs the tests and exits
+    singleRun: false,
+
+    // Concurrency level
+    // how many browser should be started simultaneous
+    concurrency: Infinity
+  })
+}

+ 38 - 0
bower_components/hijrah-date/package.json

@@ -0,0 +1,38 @@
+{
+  "name": "hijrah-date",
+  "version": "1.0.3",
+  "description": "A date in the Hijrah calendar system",
+  "main": "hijrah-date.js",
+  "keywords": "date, hijrah, hijri, calendar, islamic",
+  "author": "Mouaffak A. Sarhan <mouffaksarhan@gmail.com>",
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/msarhan/hijrah-date.git"
+  },
+  "scripts": {
+    "test": "gulp test"
+  },
+  "ignore": [
+    "**/.*",
+    "node_modules",
+    "test",
+    "src"
+  ],
+  "devDependencies": {
+    "assert": "^1.4.1",
+    "gulp": "^3.9.1",
+    "gulp-concat": "^2.6.0",
+    "gulp-connect": "^5.0.0",
+    "gulp-rename": "^1.2.2",
+    "gulp-sourcemaps": "^1.6.0",
+    "gulp-uglify": "^2.0.0",
+    "gulp-wrap": "^0.13.0",
+    "jasmine-core": "^2.5.1",
+    "karma": "^1.3.0",
+    "karma-jasmine": "^1.0.2",
+    "karma-phantomjs-launcher": "^1.0.2",
+    "phantomjs": "^2.1.7",
+    "timeshift-js": "^1.0.0"
+  }
+}

+ 5 - 0
package-lock.json

@@ -5332,6 +5332,11 @@
         "minimalistic-assert": "^1.0.1"
       }
     },
+    "hijrah-date": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/hijrah-date/-/hijrah-date-1.0.3.tgz",
+      "integrity": "sha1-96ACC07s8aVcmUqABIm3lYDdeUs="
+    },
     "hijri-date": {
       "version": "0.2.2",
       "resolved": "https://registry.npmjs.org/hijri-date/-/hijri-date-0.2.2.tgz",

+ 1 - 0
package.json

@@ -47,6 +47,7 @@
     "flatpickr": "^4.5.2",
     "font-awesome": "^4.7.0",
     "hammerjs": "^2.0.8",
+    "hijrah-date": "^1.0.3",
     "hijri-date": "^0.2.2",
     "hover.css": "^2.3.2",
     "jquery": "^3.3.1",

+ 53 - 2
src/app/External-Page/external-page-content/external-page-content.component.css

@@ -88,11 +88,39 @@ input,button {
     background-color: #e5f7f6;
     margin: 10px 0;
     margin-top: 15px;
-	    overflow: hidden;
+	overflow: hidden;
     font-size: 14px;
 }
 
 
+.vivitingTiming {
+    height: 130px !important;
+    display: flex;
+    text-align: center;
+    justify-content: center;
+    background-color: transparent !important;
+}
+
+.vivitingTiming img {
+    margin: 0 30px;
+    position: relative;
+}
+
+.openTime {
+    color: green;
+    position: absolute;
+    bottom: 0;
+    right: 64px;
+}
+
+.closeTime {
+    color: green;
+    position: absolute;
+    bottom: 0;
+    right: 64px;
+}
+
+
 .carousel-indicators {
     bottom: -5px;
 }
@@ -681,6 +709,29 @@ agm-map {
     margin: 100px auto;
   }
 
+  .visiting-timting-caption {
+      position: relative !important;
+      right: inherit;
+      left: inherit;
+      background-color: red;
+      overflow: hidden;
+  }
+
+  .visiting-timting-caption ul {
+      width: 100%;
+      background-color: green;
+      text-align: center;
+  }
+
+  .visiting-timting-caption ul li {
+      display: inline-block;
+      float: left;
+  }
+
+  .visiting-timting-caption ul li img {
+      width: 65px;
+      height: 65px;
+  }
 
   /* Safari */
   @-webkit-keyframes spin {
@@ -738,7 +789,7 @@ agm-map {
     }
 
     .lectureService-w .visitingTime-w .monthRecord-w .body ul li img {
-        width: 65px;
+        width: 65px; 
     }
 
     .lectureService-w .visitingTime-w .monthRecord-w .body ul li span {

+ 65 - 35
src/app/External-Page/external-page-content/external-page-content.component.html

@@ -14,10 +14,10 @@
                         <div class="carousel-item" *ngFor="let report of reports; let i = index" [ngClass]="i == 0 ? 'active' : ''">
                           <img src="{{ report.photo ? authSer.pathImg + report.photo.photo : '' }}" />
                           <div class="carousel-caption d-md-block">
-                              <h5>{{report.title}}</h5>
-                              <p [innerHtml] = "report.description"></p>
-                              <button class="more hvr-grow" (click)="goPageNew(report)">تفاصيل الخبر</button>
-                              <button class="moreNews hvr-grow" (click)="moreNewsPage()">المزيد من الأخبار</button>
+                            <h5>{{report.title}}</h5>
+                            <p [innerHtml] = "report.description"></p>
+                            <button class="more hvr-grow" (click)="goPageNew(report)">تفاصيل الخبر</button>
+                            <button class="moreNews hvr-grow" (click)="moreNewsPage()">المزيد من الأخبار</button>
                           </div>
                         </div>
                     </div>
@@ -28,14 +28,14 @@
               <div class="col-12">
                 <div class="eventPart-w">
                   <div id="demo1" class="carousel slide" data-ride="carousel">
-                      <div class="carousel-inner"> 
-                          <div class="carousel-item" *ngFor="let event of events; let i = index" [ngClass]="i == 0 ? 'active' : ''">
-                              <div class="carousel-caption">
-                                  <p><img src="../../../assets/image/eventX.png" /> <span> حدث :</span> {{event.name}}</p>
-                              </div>   
-                          </div>
-                          <button class="moreEvent-w" (click)="oneventTable()">المزيد</button>
+                    <div class="carousel-inner"> 
+                      <div class="carousel-item" *ngFor="let event of events; let i = index" [ngClass]="i == 0 ? 'active' : ''">
+                          <div class="carousel-caption">
+                              <p><img src="../../../assets/image/eventX.png" /> <span> حدث :</span> {{event.name}}</p>
+                          </div>   
                       </div>
+                      <button class="moreEvent-w" (click)="oneventTable()">المزيد</button>
+                    </div>
                   </div> 
                 </div>
               </div>
@@ -46,10 +46,10 @@
                     <div class="col-lg-3 col-md-3 col-sm-6 col-xs-12" *ngFor="let service of services; let i = index">
                       <div class="animated" style="position:relative">
                         <a (click)="onGetService(service)" style="cursor:pointer">
-                            <div class="item text-center">
-                              <img src="{{authSer.pathImg + service.photo}}" />
-                              <p>{{service.name}}</p>
-                            </div>
+                          <div class="item text-center">
+                            <img src="{{authSer.pathImg + service.photo}}" />
+                            <p>{{service.name}}</p>
+                          </div>
                         </a>
                         <span class="one"></span>
                         <span class="two"></span>
@@ -110,29 +110,57 @@
                       <div class="visitingTime-w">
                         <h1>مواعيد الزياره</h1>
                         <div class="row">
-                          <div class="col-12 col-sm-12 col-md-6 col-lg-6">
-                            <div class="monthRecord-w text-center">
-                              <h1>أقسام التنويم</h1>
-                              <div class="body">
-                                <ul class="list-unstyled">
-                                  <li><img src="../../../assets/image/Path 82.png" /><span style="color:green">{{hypnosisSections.open_time}}</span></li>
-									<i class="fa fa-chevron-left fa-lg text-muted"></i>
-                                  <li><img src="../../../assets/image/Path 82.png" /><span style="color:red">{{hypnosisSections.close_time}}</span></li>
-                                </ul>
-                              </div>
+                          <div class="col-12 col-sm-12 col-md-12 col-lg-12">
+                            <div class="eventPart-w vivitingTiming">
+                              <div id="demo1" class="carousel slide" data-ride="carousel">
+                                <div class="carousel-inner"> 
+                                  <div class="carousel-item" *ngFor="let timeVisit of visitingTimes; let i = index" [ngClass]="i == 0 ? 'active' : ''">
+                                    <div class="carousel-caption">
+                                      <p class="text-center">{{timeVisit.name}}</p>
+                                      <div style="display:inline-block;;position:relative">
+                                        <img src="../../../assets/image/Path 82.png" /><span style="color:green" class="openTime">{{timeVisit.open_time}}</span>
+                                      </div>
+                                      <i class="fa fa-chevron-left fa-lg text-muted"></i>
+                                      <div style="display:inline-block;position:relative">
+                                        <img src="../../../assets/image/Path 82.png" /><span style="color:green" class="closeTime">{{timeVisit.close_time}}</span>
+                                      </div>
+                                    </div>   
+                                  </div>
+                                </div>
+                              </div> 
                             </div>
-                          </div>
-                          <div class="col-12 col-sm-12 col-md-6 col-lg-6">
-                            <div class="achiev text-center">
-                              <h1>العنايه المركزه</h1>
+                            <!-- <div id="demo55" class="carousel slide" data-ride="carousel">
+                              <ul class="carousel-indicators">
+                                  <li *ngFor="let timeVisit of visitingTimes; let i = index" data-target="#demo55" [attr.data-slide-to]="i" [ngClass]="i == 0 ? 'active' : ''"></li>
+                              </ul>
+                              <div class="carousel-inner">
+                                <div class="carousel-item" *ngFor="let timeVisit of visitingTimes; let i = index" [ngClass]="i == 0 ? 'active' : ''">
+                                  <div class="carousel-caption">
+                                      <div class="monthRecord-w text-center">
+                                        <div class="body">
+                                          <ul class="list-unstyled">
+                                            <li><img src="../../../assets/image/Path 82.png" /><span style="color:green">{{timeVisit.open_time}}</span></li>
+                                            <i class="fa fa-chevron-left fa-lg text-muted"></i>
+                                            <li><img src="../../../assets/image/Path 82.png" /><span style="color:red">{{timeVisit.close_time}}</span></li>
+                                          </ul>
+                                        </div>
+                                      </div> 
+                                  </div>   
+                                </div>
+                              </div>
+                            </div>  -->
+
+                            <!-- <div class="monthRecord-w text-center">
                               <div class="body">
                                 <ul class="list-unstyled">
-                                  <li><img src="../../../assets/image/Path 82.png" /><span style="color:green">{{intensiveCare.open_time}}</span></li>
-									<i class="fa fa-chevron-left fa-lg text-muted"></i>
-                                  <li><img src="../../../assets/image/Path 82.png" /><span style="color:red">{{intensiveCare.close_time}}</span></li>
+                                  <div *ngFor="let timeVisit of visitingTimes">
+                                    <li><img src="../../../assets/image/Path 82.png" /><span style="color:green">{{timeVisit.open_time}}</span></li>
+									                  <i class="fa fa-chevron-left fa-lg text-muted"></i>
+                                    <li><img src="../../../assets/image/Path 82.png" /><span style="color:red">{{timeVisit.close_time}}</span></li>
+                                  </div>
                                 </ul>
                               </div>
-                            </div>
+                            </div> -->
                           </div>
                         </div>
                       </div>
@@ -319,7 +347,8 @@
                     </div>
                   </div>
                 </div>
-                <div class="col-12 col-sm-12 col-md-8 col-lg-8">
+
+                <!-- <div class="col-12 col-sm-12 col-md-8 col-lg-8">
                   <div class="visitingTime-w">
                     <h1>Dates of the visit</h1>
                     <div class="row">
@@ -347,7 +376,8 @@
                       </div>
                     </div>
                   </div>
-                </div>
+                </div> -->
+
               </div>
             </div>
           </div>

+ 3 - 3
src/app/External-Page/external-page-content/external-page-content.component.ts

@@ -34,7 +34,7 @@ export class ExternalPageContentComponent implements OnInit, OnDestroy {
   events = [];
   services = [];
   secondAdvertisiment = [];
-  hypnosisSections = [];
+  visitingTimes:any = [];
   intensiveCare = []; 
   recordsOfMonth = [];
   achievements = [];
@@ -93,8 +93,8 @@ export class ExternalPageContentComponent implements OnInit, OnDestroy {
         this.firstAdvertisiment = responce['data'].first_advertising_services_row;
         console.log('first adverrrr', this.firstAdvertisiment);
         this.secondAdvertisiment = responce['data'].second_advertising_services_row;
-        this.hypnosisSections = responce['data'].visiting_times_hs;
-        this.intensiveCare = responce['data'].visiting_times_ic;
+        this.visitingTimes = responce['data'].visiting_times;
+        ///this.intensiveCare = responce['data'].visiting_times_ic;
         this.recordsOfMonth = responce['data']['statistics'];
         if(responce['data']['statistics'].statistics_values.length > 0) {
           this.checkStatisticShow = false;

+ 2 - 2
src/app/auth-services/regester/regester.component.html

@@ -97,7 +97,7 @@
                 <label for="birthday" style="float:right">تاريخ الميلاد <span class="spanReqired-w">*</span></label><br>
                 <div class="wrapping-date-div">
                   <select class="width_100" [(ngModel)]="birthDate.year" [ngModelOptions]="{standalone: true}">
-                    <option *ngFor="let year of higriYears" value="{{year}}">{{year}}</option>
+                    <option *ngFor="let year of higriBirthDate" value="{{year}}">{{year}}</option>
                   </select>
                   <select class="width_100" [(ngModel)]="birthDate.month" [ngModelOptions]="{standalone: true}">
                     <option *ngFor="let month of higriMonth" [value]="month.value">{{month.name}}</option>
@@ -224,7 +224,7 @@
             <div class="col-12 col-sm-12 col-md-6 col-lg-4">
                 <div class="form-group">
                   <label for="date_employment" style="float:right">تاريخ التوظيف الميلادي <span class="spanReqired-w">*</span></label>
-                  <input type="date" class="form-control" id="date_employment" formControlName="date_of_employment_gre" #gerDate (change)="changeEployeeGre()" />
+                  <input type="date" class="form-control" id="date_employment" formControlName="date_of_employment_gre" #gerDate (change)="changeEployeeGre()" max="2020-12-31" />
                 </div>
               </div>
   

+ 14 - 4
src/app/auth-services/regester/regester.component.ts

@@ -97,6 +97,8 @@ export class RegesterComponent implements OnInit {
     name: ''
   }
 
+  max: any = '1-1-2020';
+
 
 
   birthDate = {
@@ -112,6 +114,7 @@ export class RegesterComponent implements OnInit {
   }
 
    higriYears:any = [];
+   higriBirthDate: any = [];
 
    higriMonth = [{name: 'محرم', value :"1"},
     {name: 'صفر', value: '2'}, 
@@ -121,7 +124,7 @@ export class RegesterComponent implements OnInit {
     {name: 'جمادى الآخرة', value: '6'}, 
     {name: 'رجب', value: '7'}, 
     {name: 'شعبان', value: '8'}, 
-    {namee: 'رمضان', value: '9'}, 
+    {name: 'رمضان', value: '9'}, 
     {name: 'شوال', value: '10'},
     {name: 'ذو القعدة', value: '11'}, 
     {name: 'ذو الحجة', value: '12'}];
@@ -140,7 +143,6 @@ export class RegesterComponent implements OnInit {
     this.authSer.arabicTemplate = true;
   
     
-    
     this.typeTitle = 'تسجيل الدخول';
 
     //days array
@@ -149,10 +151,15 @@ export class RegesterComponent implements OnInit {
     }
 
     //higr years
-    for(let i = 1410; i < 1460; i++) {
+    for(let i = 1360; i < 1442; i++) {
       this.higriYears.push(i);
     }
 
+    //higr years
+    for(let i = 1360; i < 1442; i++) {
+      this.higriBirthDate.push(i);
+    }
+
   
 
     this.route.params.subscribe(
@@ -561,6 +568,10 @@ export class RegesterComponent implements OnInit {
         this.griDate.day = parseInt(dateValExisting.day);
         console.log(this.griDate);
       }
+
+
+
+     
      
 
     //submitted form 
@@ -593,7 +604,6 @@ export class RegesterComponent implements OnInit {
 
       if(this.userProfileId) {
         userDataRegester['id'] = this.userProfileId;
-        console.log('dataaaaaaaaaaaa', userDataRegester);
         if(this.checkUserType == 1) {
           //edit profile visitor submited 
           if(this.regesterForm.get('password').value != this.regesterForm.get('password_confirmation').value){

+ 1 - 0
src/app/dashboard/dashboard-routing.ts

@@ -185,6 +185,7 @@ const dashboardRouting: Routes = [
     {path: 'contactUsList/:listPageId', component: ContactUsListComponent , canActivate: [AuthGuard]},
     {path: 'contactUs/:typeContactUs/:contactId', component: AddContactUsComponent , canActivate: [AuthGuard]},
     {path: 'visitingTimesList/:listPageId', component: VisitingTimesListComponent , canActivate: [AuthGuard]},
+    {path: 'visitingTimeAdd', component: AddVisitingTimeComponent, canActivate: [AuthGuard]},
     {path: 'visitingTime/:typeVisitingTime/:visitingTimeId', component: AddVisitingTimeComponent , canActivate: [AuthGuard]},
     {path: 'eventCalendarsList/:listPageId', component: EventCalendarsListComponent , canActivate: [AuthGuard]},
     {path: 'addEventCalendar', component: AddEventCalendarComponent, canActivate: [AuthGuard] },

+ 2 - 0
src/app/dashboard/external-services/add-external/add-external.component.html

@@ -46,6 +46,8 @@
                         <option value="4">4</option>
                         <option value="5">5</option>
                         <option value="6">6</option>
+                        <option value="6">7</option>
+                        <option value="6">8</option>
                       </select>
                     </div>
                   </div>

+ 0 - 2
src/app/dashboard/lectures/lectures-list/lectures-list.component.html

@@ -57,7 +57,6 @@
           <th>الترتيب</th>
           <th>تاريخ الإنشاء</th>
           <th>الناشر</th>
-          <th> موقع العرض</th>
           <th *ngIf="authSer.showEditBtn">تعديل</th>
         </tr>
       </thead>
@@ -76,7 +75,6 @@
           </td>
           <td>{{lecture.created_at}}</td>
           <td>{{lecture.created_by_name}}</td>
-          <td>{{lecture.display_location == 'both' ? 'كلاهما' : lecture.display_location == 'internal' ? 'الصفحه الداخليه' : lecture.display_location == 'external' ? 'الصفحه الخارجيه' : 'غير موجود'}}</td>
           <td *ngIf="authSer.showEditBtn"><button type="button" class="btn btn-outline-secondary" (click)="onEdit(lecture.id)"><i class="fas fa-edit"></i></button></td>
         </tr>
       </tbody>

+ 2 - 5
src/app/dashboard/users/form-user/form-user.component.ts

@@ -39,9 +39,6 @@ export class FormUserComponent implements OnInit {
         this.spineer.show();
        }
 
-
-
-
   files:any;
   adminstration = [];
   countries = [];
@@ -102,7 +99,7 @@ export class FormUserComponent implements OnInit {
     {name: 'جمادى الآخرة', value: '6'}, 
     {name: 'رجب', value: '7'}, 
     {name: 'شعبان', value: '8'}, 
-    {namee: 'رمضان', value: '9'}, 
+    {name: 'رمضان', value: '9'}, 
     {name: 'شوال', value: '10'},
     {name: 'ذو القعدة', value: '11'}, 
     {name: 'ذو الحجة', value: '12'}];
@@ -134,7 +131,7 @@ export class FormUserComponent implements OnInit {
       }
 
       //higr years
-      for(let i = 1410; i < 1460; i++) {
+      for(let i = 1360; i < 1440; i++) {
         this.higriYears.push(i);
       }
     

+ 2 - 0
src/app/dashboard/vehicle-maintenance/vehicle-maintenance-list/vehicle-maintenance-list.component.css

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

+ 13 - 1
src/app/dashboard/visiting-times/add-visiting-time/add-visiting-time.component.ts

@@ -40,7 +40,7 @@ export class AddVisitingTimeComponent implements OnInit {
     ngOnInit() {
       this.route.params.subscribe(
         (params: Params) => {
-          if(params['typeVisitingTime'] == 'add'){
+          if(params['typeVisitingTime'] != 'edit'){
             this.typeMode = false;
             this.typeLink = 'إنشاء موعد';
           } else if(params['typeVisitingTime'] == 'edit') {
@@ -92,6 +92,18 @@ export class AddVisitingTimeComponent implements OnInit {
             this.toastr.error(' خطأ في التعديل !');
           }
         );
+      } else {
+        this.dashboardSer.addItem(dataFormContactUs, 'visitingTime').subscribe(
+          (response) => {
+            console.log(response);
+            this.toastr.success('تم الإضافه بنجاح');
+            this.location.back();
+          },
+          (error) => {
+            console.log(error);
+            this.toastr.success('خطأ في الإضافه !');
+          }
+        )
       }
     }
 

+ 30 - 0
src/app/dashboard/visiting-times/visiting-times-list/visiting-times-list.component.css

@@ -0,0 +1,30 @@
+.table {
+    margin: 30px 0;
+}
+
+.dashButton-w {
+    float: right;
+    margin: 10px;
+}
+
+.custom-control-label::after,
+.custom-control-label::before {
+    width: 1.5rem;
+    height: 1.5rem;
+}
+
+.fixedWidthLabel-w::after,
+.fixedWidthLabel-w::before {
+    width: 1.5rem;
+    height: 1.5rem;
+}
+
+.disblayBlock-w {
+    display: block;
+}
+
+/* .centerIneerItem {
+    display: flex;
+    justify-content: center;
+    text-align: center;
+} */

+ 19 - 22
src/app/dashboard/visiting-times/visiting-times-list/visiting-times-list.component.html

@@ -14,21 +14,10 @@
 
   <div class="containerContent-w">
 
-      <div class="row">
-        <div class="col-12 col-sm-12 col-md-6 col-lg-6" style="padding: 15px 10px;">
-          <div class="form-group">
-            <span class="spanSelect-w">
-              <select [ngModel]="dataTableNumber" class="form-control selectButton-w" (input)="onGetValue($event)">
-                <option value="5">5</option>
-                <option value="10">10</option>
-                <option value="15">15</option>
-                <option value="20">20</option>
-              </select>
-              من العناصر يتم عرضها
-            </span>
-          </div>
-          <!-- <button type="button" class="btn btn-outline-success butttonCreate dashButton-w" (click)="onAdd()" *ngIf="authSer.showAddBtn"><i class="fas fa-plus marginFontAowsome-w"></i>إنشاء جديد</button> -->
-          <!-- <button type="button" class="btn btn-outline-danger butttonDelete dashButton-w" (click)="onDelete()" *ngIf="authSer.showDeleteBtn"><i class="fas fa-times marginFontAowsome-w"></i>حذف</button> -->
+    <div class="row">
+        <div class="col-12 col-sm-12 col-md-6 col-lg-6">
+          <button type="button" class="btn btn-outline-success butttonCreate dashButton-w" (click)="onAdd()" *ngIf="authSer.showAddBtn"><i class="fas fa-plus marginFontAowsome-w"></i>إنشاء جديد</button>
+          <button type="button" class="btn btn-outline-danger butttonDelete dashButton-w" (click)="onDelete()" *ngIf="authSer.showDeleteBtn"><i class="fas fa-times marginFontAowsome-w"></i>حذف</button>
         </div>
         <div class="col-12 col-sm-12 col-md-6 col-lg-6">
           <div class="form-group">
@@ -37,14 +26,22 @@
           </div>
         </div>
       </div>
-
-    <div class="row">
-      <div class="col-12 col-sm-12 col-md-12 col-lg-6">
-      </div>
-      <div class="col-12 col-sm-12 col-md-12 col-lg-6">
-
+  
+      <div class="row">
+          <div class="col-12 col-sm-12 col-md-6 col-lg-6" style="padding: 15px 10px;">
+              <div class="form-group">
+                <span class="spanSelect-w">
+                  <select [ngModel]="dataTableNumber" class="form-control selectButton-w" (input)="onGetValue($event)">
+                    <option value="5">5</option>
+                    <option value="10">10</option>
+                    <option value="15">15</option>
+                    <option value="20">20</option>
+                  </select>
+                  من العناصر يتم عرضها
+                </span>
+              </div>
+            </div>
       </div>
-    </div>
 
     <table class="table table-bordered">
       <thead class="headBackground-w">

+ 8 - 8
src/app/dashboard/visiting-times/visiting-times-list/visiting-times-list.component.ts

@@ -241,17 +241,17 @@ export class VisitingTimesListComponent implements OnInit {
         }
       };
 
-      //add function
-      onAdd() {
-      console.log('service/' + this.userLoginId + '/' + this.serviceId + '/visitingTime/add');
-      this.router.navigate(['service/' + this.userLoginId + '/' + this.serviceId + '/visitingTime/add']);
-    }
+    //add function
+  onAdd() {
+    console.log('service/' + this.userLoginId + '/' + this.serviceId + '/visitingTime/add');
+    this.router.navigate(['service/' + this.userLoginId + '/' + this.serviceId + '/visitingTimeAdd']);
+  }
 
-    //edit function
-    onEdit(editTabID) {
+  //edit function
+  onEdit(editTabID) {
     localStorage.setItem('editvisitingTimeIdStorage', editTabID);
     this.router.navigate(['service/' + this.userLoginId + '/' + this.serviceId + '/visitingTime/edit/'+ editTabID]);
     console.log('service/' + this.userLoginId + '/' + this.serviceId + '/visitingTime/edit/'+ editTabID);
-    };
+  };
 
 }

+ 1 - 1
src/app/shared/auth-service.service.ts

@@ -237,7 +237,7 @@ export class AuthServiceService {
     }).replace(/[۰۱۲۳۴۵۶۷۸۹]/g, function(d) {
         return d.charCodeAt(0) - 1776; // Convert Persian numbers
     }) );
-}
+  }
 
 
 }

+ 2 - 0
src/app/shared/dashboard.service.ts

@@ -193,6 +193,8 @@ export class DashboardService {
         return this.http.post(this.authService.pathApi + '/add_female_request' , data);
       }else if(addType == 'addFemaleRequestAdmin') {
         return this.http.post(this.authService.pathApi + '/handle_female_request' , data);
+      } else if(addType == 'visitingTime'){
+        return this.http.post(this.authService.pathApi + '/add_visiting_time' , data);
       }
     }