diff --git a/Source/App/Client/Gulpfile.js b/Source/App/Client/Gulpfile.js index b9ab6b9..7d5ec9c 100644 --- a/Source/App/Client/Gulpfile.js +++ b/Source/App/Client/Gulpfile.js @@ -1,9 +1,12 @@ -var old = "1.0.0"; -var current = "1.1.0"; +var old = "1.1.0"; +var current = "1.1.1"; var localTitle = ">Dental Clinic<"; var productionTitle = ">Mahmuda Dental Surgery & Healing Center<"; +var localAddress = ">Chamber Address<"; +var productionAddress = ">8/L/20, Middle Nandipara
(Former House # 13, Road # 3, One Bank Goli),
Dhaka 1214<"; + var oldVersionNo = "v" + old; var newVersionNo = "v" + current; @@ -43,8 +46,8 @@ var gulp = require("gulp"), replace = require("gulp-replace"), gutil = require('gulp-util'), - pump = require('pump'); - + pump = require('pump'), + rename = require('gulp-rename'); // minify new images @@ -74,14 +77,16 @@ gulp.task("htmls", function (done) { .pipe(debug()) .pipe(replace("app/views/", "dist/" + newVersionNo + "/views/")) .pipe(replace(localTitle, productionTitle)) + .pipe(replace(localAddress, productionAddress)) .pipe(replace("./app/images/", "dist/" + newVersionNo + "/images/")) .pipe(gulp.dest(htmlDst)) //.pipe(notify({ message: 'htmls task complete' })) ; - gulp.src(["./index.html"]) + gulp.src(["./index-prod.html"]) .pipe(replace(oldVersionNo, newVersionNo)) .pipe(replace(localTitle, productionTitle)) + .pipe(rename('index.html')) .pipe(gulp.dest("./")); done(); @@ -192,7 +197,7 @@ gulp.task("replace-footer-version", function (done) { // Clean gulp.task("clean", function (cb) { - del(["dist", ".temp"], cb, { dryRun: true }); + del(["dist", ".temp", "index.html"], cb, { dryRun: true }); console.log("clean task finished"); return new Promise(function (resolve, reject) { console.log("HTTP Server Started"); diff --git a/Source/App/Client/app/scripts/user/user.controller.js b/Source/App/Client/app/scripts/user/user.controller.js index 6695ad8..f6f69a3 100644 --- a/Source/App/Client/app/scripts/user/user.controller.js +++ b/Source/App/Client/app/scripts/user/user.controller.js @@ -19,7 +19,7 @@ $scope.getRoles = function() { var success = function(response) { console.log(response); - $scope.roles = response.data; + $scope.roles = response; $scope.getUsers(); }; var error = function(error) { @@ -39,7 +39,7 @@ $scope.getUsers = function() { var success = function(response) { console.log(response); - $scope.list = response.data; + $scope.list = response; }; var error = function(error) { console.log(error); @@ -80,7 +80,7 @@ $scope.getUser = function(id) { var success = function(response) { console.log(response); - $scope.model = response.data; + $scope.model = response; $scope.model.PasswordHash = ""; $scope.model.RetypePassword = ""; $scope.model.RoleId = response.Roles[0].RoleId; diff --git a/Source/App/Client/app/views/auth/permission.tpl.html b/Source/App/Client/app/views/auth/permission.tpl.html index 8b0f86b..38dc2c0 100644 --- a/Source/App/Client/app/views/auth/permission.tpl.html +++ b/Source/App/Client/app/views/auth/permission.tpl.html @@ -1,8 +1,10 @@ -
+ -
- -
+
@@ -37,9 +39,13 @@

Roles

-
-

Resources

+
+

Resources

+
+ +
+
@@ -52,17 +58,17 @@

Resources

- + Selected Role: {{selectedRole.Name}} - + - -
-
+ +
+
-
- +
+
@@ -91,11 +97,11 @@

Resources

-
#
+
- -
+ +
diff --git a/Source/App/Client/app/views/auth/resource.tpl.html b/Source/App/Client/app/views/auth/resource.tpl.html index 42a1406..1969a31 100644 --- a/Source/App/Client/app/views/auth/resource.tpl.html +++ b/Source/App/Client/app/views/auth/resource.tpl.html @@ -1,118 +1,116 @@ -
+ -
- -
+
-
+
+
-

Add Resource

+
+

Resources

+
+ +
+
+
-
-
- -
- -
-
+
+ -
- -
- +
+
+ Name + +
-
-
- -
-
- - - - +
+
+ Route + +
+
+
+
+ Public +
+ + + +
-
-
- -
- - - +
+
+ + + +
+ + +
+ +
+ + +
+
+
+ + +
+
- -
-
-
-
+
+ + + + + + + + + + + + + + + + + + + + + + +
#NameRoutePublic
{{l.Id}}{{$index + 1}}{{l.Name}}{{l.Route}}{{l.IsPublic}} + + + +
+
-
-
- -
-

Resources

-
-
-
-
-
- - -
-
-
- -
- - - - - - - - - - - - - - - - - - - - - - -
#NameRoutePublic
{{l.Id}}{{$index + 1}}{{l.Name}}{{l.Route}}{{l.IsPublic}} - - - -
diff --git a/Source/App/Client/app/views/auth/role.tpl.html b/Source/App/Client/app/views/auth/role.tpl.html index 69de7ae..2813c6f 100644 --- a/Source/App/Client/app/views/auth/role.tpl.html +++ b/Source/App/Client/app/views/auth/role.tpl.html @@ -1,85 +1,84 @@ -
+
-
- -
- -
+
-

Add Role

+
+

Roles

+
+ +
+
-
-
- -
- +
+ + +
+
+ Name + +
-
-
- -
+
+ +
+ +
+ +
+
+
+ + +
+
- -
-
-
-
+
+
+ + + + + + + + + + + + + + + + + + +
#Name
{{l.Id}}{{$index + 1}}{{l.Name}} + +      -
-
- -
-

Roles

-
-
-
-
-
- - +
+ +
- -
-
- -
- - - - - - - - - - - - - - - - - - -
#Name
{{l.Id}}{{$index + 1}}{{l.Name}} - -      + + + - - -
+
+ +
diff --git a/Source/App/Client/app/views/patient/patient-detail.tpl.html b/Source/App/Client/app/views/patient/patient-detail.tpl.html index c9723cd..2452203 100644 --- a/Source/App/Client/app/views/patient/patient-detail.tpl.html +++ b/Source/App/Client/app/views/patient/patient-detail.tpl.html @@ -20,16 +20,24 @@ visibility: visible; } + #mainPage * { + display: none; + } + + .modal, + .modal * { + /**Remove scrollbar for printing.**/ + overflow: visible !important; + } + .modal { left: 0; + top: 0; margin: 0; - min-height: 550px; - /**Remove scrollbar for printing.**/ - overflow: visible !important; padding: 0; - position: absolute; - top: 0; - visibility: visible; + min-height: 550px; + position: absolute !important; + visibility: visible !important; } .modal-dialog { @@ -38,6 +46,11 @@ visibility: visible !important; } + .modal-backdrop { + background-color: white; + opacity: 1 !important; + } + li { page-break-after: auto; } @@ -48,7 +61,7 @@ } -
+
@@ -125,7 +138,7 @@

Payment History:

Date Amount - Service Comment + Paid for Service Taken @@ -214,45 +227,48 @@

Payment History:

-
-
- -
- +
+ + + +
+
+ + +
-
-
- -
- +
+ +
+ + +
-
-
- -
- +
+
+ + +
-
-
- -
+
-
- + +
+

Payment History:

- + @@ -361,66 +377,77 @@

Payment History:

-
-
- -
- +
+ + +
+
+ + +
-
-
- -
- +
+
+ + +
-
-
- -
- + +
+ +
+
+ + +
-
-
- -
- +
+
+ + +
-
-
- -
- +
+ +
+
+ + +
-
-
- -
- +
+
+ + +
-
-
- -
- +
+ +
+
+ + +
-
-
- -
- +
+
+ + +
-
-
- -
+ +
+ +
-
- + + +
@@ -438,108 +465,110 @@

Payment History:

Date AmountService CommentPaid for Service Taken