Skip to content

Commit

Permalink
more angulr version updrage issue resovled and ui improved
Browse files Browse the repository at this point in the history
  • Loading branch information
@sabbiryan
sabbiryan committed Sep 8, 2023
1 parent 31dcde4 commit 2da565e
Show file tree
Hide file tree
Showing 8 changed files with 516 additions and 461 deletions.
17 changes: 11 additions & 6 deletions Source/App/Client/Gulpfile.js
View file
Original file line number Diff line number Diff line change
@@ -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 <br />(Former House # 13, Road # 3, One Bank Goli), <br/>Dhaka 1214<";

var oldVersionNo = "v" + old;
var newVersionNo = "v" + current;

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -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");
Expand Down
6 changes: 3 additions & 3 deletions Source/App/Client/app/scripts/user/user.controller.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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);
Expand Down Expand Up @@ -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;
Expand Down
38 changes: 22 additions & 16 deletions Source/App/Client/app/views/auth/permission.tpl.html
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
<div class="row" cg-busy="promise">
<style>
.table-responsive {
height: calc(100vh - 378px);
}
</style>

<div>
<button ui-sref="root.dashboard" class="btn btn-link" data-toggle="tooltip" data-placement="right" title="Back"><span class="glyphicon glyphicon-arrow-left"></span></button>
</div>
<div class="row" cg-busy="promise">

<div class="col col-xs-12 col-sm-5 col-md-5 col-lg-5">
<div class="panel panel-info">
Expand Down Expand Up @@ -37,9 +39,13 @@ <h3 class="panel-title">Roles</h3>

<div class="col col-xs-12 col-sm-7 col-md-7 col-lg-7">
<div class="panel panel-info">
<!-- Default panel contents -->
<div class="panel-heading">
<h3 class="panel-title">Resources</h3>
<div class="row">
<div class="col-sm-6"><h3 class="panel-title">Resources</h3></div>
<div class="col-sm-6 text-right">
<button ui-sref="root.patient" class="btn btn-default" data-toggle="tooltip" data-placement="left" title="Back"><span class="glyphicon glyphicon-repeat"></span></button>
</div>
</div>
</div>
<div class="panel-body">
<div class="form-group">
Expand All @@ -52,17 +58,17 @@ <h3 class="panel-title">Resources</h3>
</div>

<button type="button" ng-show="isUpdateMode" class="btn btn-floating btn-warning" ng-click="cancel()">Cancel</button>

<span ng-show="selectedRole" class="text-center text-warning">Selected Role: <strong>{{selectedRole.Name}}</strong></span>

<button class="btn btn-info pull-right" ng-click="save()">Save</button>
<br/>
<br/>

<br />
<br />

<!-- Table -->
<div id="no-more-tables">
<table class="table table-responsive table-striped table-bordered table-hover">
<div class="table-responsive">
<table class="table table-striped table-bordered table-hover">
<thead>
<tr>
<th>#</th>
Expand Down Expand Up @@ -91,11 +97,11 @@ <h3 class="panel-title">Resources</h3>
</td>
</tr>
</tbody>
</table>
</table>
</div>
</div>
<div class="panel-footer">

<div class="panel-footer">
</div>
</div>
</div>
Expand Down
184 changes: 91 additions & 93 deletions Source/App/Client/app/views/auth/resource.tpl.html
View file
Original file line number Diff line number Diff line change
@@ -1,118 +1,116 @@
<div class="row" cg-busy="promise">
<style>
.table-responsive {
height: calc(100vh - 378px);
}
</style>

<div>
<button ui-sref="root.dashboard" class="btn btn-link" data-toggle="tooltip" data-placement="right" title="Back"><span class="glyphicon glyphicon-arrow-left"></span></button>
</div>
<div class="row" cg-busy="promise">

<div class="col col-xs-12 col-sm-5 col-md-5 col-lg-5">
<div class="col-sm-12">
<div class="panel panel-info">

<div class="panel-heading">
<h3 class="panel-title">Add Resource</h3>
<div class="row">
<div class="col-sm-6"><h3 class="panel-title">Resources</h3></div>
<div class="col-sm-6 text-right">
<button ui-sref="root.patient" class="btn btn-default" data-toggle="tooltip" data-placement="left" title="Back"><span class="glyphicon glyphicon-repeat"></span></button>
</div>
</div>
</div>

<div class="panel-body">
<form class="form-horizontal" ng-submit="save()">

<div class="form-group">
<label class="control-label col col-xs-12 col-sm-4 col-md-4 col-lg-4">Name :</label>
<div class="col col-xs-12 col-sm-8 col-md-8 col-lg-8">
<input type="text" class="form-control" ng-model="model.Name" required="required" />
</div>
</div>
<div class="row">
<form class="form-horizontal" ng-submit="save()">

<div class="form-group">
<label class="control-label col col-xs-12 col-sm-4 col-md-4 col-lg-4">Route :</label>
<div class="col col-xs-12 col-sm-8 col-md-8 col-lg-8">
<input type="text" class="form-control" ng-model="model.Route" required="required" />
<div class="col-sm-3">
<div class="input-group">
<span class="input-group-addon">Name</span>
<input type="text" class="form-control" ng-model="model.Name" required="required" />
</div>
</div>
</div>

<div class="form-group">
<label class="control-label col col-xs-12 col-sm-4 col-md-4 col-lg-4">Public :</label>
<div class="col col-xs-12 col-sm-8 col-md-8 col-lg-8">
<div class="btn-group" data-toggle="buttons">
<!--<label class="btn btn-primary active">
<input type="radio" ng-model="model.IsPublic" ng-value="isPublicEnum.False" autocomplete="off"> No
</label>
<label class="btn btn-primary">
<input type="radio" ng-model="model.IsPublic" value="isPublicEnum.True" autocomplete="off"> Yes
</label>-->

<label>
<input type="radio" ng-model="model.IsPublic" value="0" ng-value="isPublicEnum.False">
No
</label>
<label>
<input type="radio" ng-model="model.IsPublic" value="1" ng-value="isPublicEnum.True">
Yes
</label>
<div class="col-sm-3">
<div class="input-group">
<span class="input-group-addon">Route</span>
<input type="text" class="form-control" ng-model="model.Route" required="required" />
</div>
</div>

<div class="col-sm-2">
<div class="input-group">
<span class="input-group-addon">Public </span>
<div class="btn-group" data-toggle="buttons" style="margin-left: 10px">
<label>
<input type="radio" ng-model="model.IsPublic" value="0" ng-value="isPublicEnum.False">
No
</label>
<label>
<input type="radio" ng-model="model.IsPublic" value="1" ng-value="isPublicEnum.True">
Yes
</label>

</div>
</div>
</div>
</div>



<div class="form-group">
<label class="control-label col col-xs-12 col-sm-4 col-md-4 col-lg-4">&nbsp;</label>
<div class="col col-xs-12 col-sm-8 col-md-8 col-lg-8">
<button type="submit" ng-show="!isUpdateMode" class="btn btn-floating btn-info">Save</button>
<button type="submit" ng-show="isUpdateMode" class="btn btn-floating btn-info">Update</button>
<button type="button" ng-show="isUpdateMode" class="btn btn-floating btn-warning" ng-click="cancel()">Cancel</button>
<div class="col-sm-2">
<div class="input-group">
<button type="submit" ng-show="!isUpdateMode" class="btn btn-floating btn-info">Save</button>
<button type="submit" ng-show="isUpdateMode" class="btn btn-floating btn-info">Update</button>
<button type="button" ng-show="isUpdateMode" class="btn btn-floating btn-warning" ng-click="cancel()">Cancel</button>
</div>
</div>

</form>
</div>

<div class="row" style="margin-top: 20px">


<div class="col-sm-12">
<form ng-submit="search()">
<div class="input-group">
<input type="text" class="form-control" placeholder="Search by Role Name" ng-model="search.key" required="required">
<span type="submit" class="input-group-addon"><a style="cursor: pointer; text-decoration: none" class="glyphicon glyphicon-search btn-floating" ng-click="search()"></a></span>
</div>
</form>
</div>

</form>
</div>
<div class="panel-footer"></div>
</div>
</div>
<div class="col-sm-12 table-responsive " style="margin-top: 20px">
<table class="table table-striped table-bordered table-hover">
<thead>
<tr>
<th>#</th>
<th>Name</th>
<th>Route</th>
<th>Public</th>
<th></th>
<th></th>
</tr>
</thead>
<tbody>
<tr ng-repeat="l in list track by $index">
<td ng-show="false">{{l.Id}}</td>
<td data-title="SL: ">{{$index + 1}}</td>
<td data-title="Name: ">{{l.Name}}</td>
<td data-title="Route: ">{{l.Route}}</td>
<td data-title="Public: ">{{l.IsPublic}}</td>
<td data-title="Edit: ">
<a class="glyphicon glyphicon-edit" style="cursor: pointer;" ng-click="edit(l.Id)"></a>
</td>
<td data-title="Delete: ">
<a class="glyphicon glyphicon-trash" style="cursor: pointer;" ng-click="remove('', l, 'delete')"></a>
</td>
</tr>
</tbody>
</table>
</div>

<div class="col col-xs-12 col-sm-7 col-md-7 col-lg-7">
<div class="panel panel-info">
<!-- Default panel contents -->
<div class="panel-heading">
<h3 class="panel-title">Resources</h3>
</div>
<div class="panel-body">
<div class="form-group">
<form ng-submit="search()">
<div class="input-group">
<input type="text" class="form-control" placeholder="Search by Role Name" ng-model="search.key" required="required">
<span type="submit" class="input-group-addon"><a style="cursor: pointer; text-decoration: none" class="glyphicon glyphicon-search btn-floating" ng-click="search()"></a></span>
</div>
</form>
</div>
</div>

<!-- Table -->
<div id="no-more-tables">
<table class="table table-responsive table-striped table-bordered table-hover">
<thead>
<tr>
<th>#</th>
<th>Name</th>
<th>Route</th>
<th>Public</th>
<th></th>
<th></th>
</tr>
</thead>
<tbody>
<tr ng-repeat="l in list track by $index">
<td ng-show="false">{{l.Id}}</td>
<td data-title="SL: ">{{$index + 1}}</td>
<td data-title="Name: ">{{l.Name}}</td>
<td data-title="Route: ">{{l.Route}}</td>
<td data-title="Public: ">{{l.IsPublic}}</td>
<td data-title="Edit: ">
<a class="glyphicon glyphicon-edit" style="cursor: pointer;" ng-click="edit(l.Id)"></a>
</td>
<td data-title="Delete: ">
<a class="glyphicon glyphicon-trash" style="cursor: pointer;" ng-click="remove('', l, 'delete')"></a>
</td>
</tr>
</tbody>
</table>
</div>

<div class="panel-footer">
Expand Down
Loading

0 comments on commit 2da565e

Please sign in to comment.