Skip to content

M
mytime
Commit d07aff9a authored by dgoud-nisum-com's avatar dgoud-nisum-com Committed by tdutta-nisum-com
Browse files
Options

UpdateButtonDisable_UI_Changes and Changes in AddProjects (#84)

parent 9f719d68
Show whitespace changes
Inline Side-by-side
Showing with 34 additions and 11 deletions
src/main/webapp/WEB-INF/controllers/DomainController.js
View file @ d07aff9a
...@@ -12,8 +12,8 @@ myApp.controller("domainController", ...@@ -12,8 +12,8 @@ myApp.controller("domainController",
}); });
var getCellTemplate = '<p class="col-lg-12"><i class="fa fa-pencil-square-o fa-2x" aria-hidden="true" style="font-size:1.5em;margin-top:3px;cursor:pointer;" data-placement="center" title="Edit" onmouseenter="$(this).tooltip(\'show\')" ng-click="grid.appScope.getRowData(row,\'Update\')"></i>' var getCellTemplate = '<p class="col-lg-12"><p class="col-lg-4"><i class="fa fa-pencil-square-o fa-2x" ng-show="row.entity.status == \'Active\'" aria-hidden="true" id="UpdateBtnVisible" style="font-size:1.5em;margin-top:3px;cursor:pointer;" data-placement="center" title="Edit" onmouseenter="$(this).tooltip(\'show\')" ng-click="grid.appScope.getRowData(row,\'Update\')"></i></p>'+
+ '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<i class="fa fa-minus-circle fa-2x" aria-hidden="true" style="font-size:1.5em;margin-top:3px;cursor:pointer;" data-placement="left" title="Delete" onmouseenter="$(this).tooltip(\'show\')" ng-click="grid.appScope.getRowData(row,\'Delete\')"></i></p>'; '<p class="col-lg-4"><i class="fa fa-minus-circle fa-2x" aria-hidden="true" style="font-size:1.5em;margin-top:3px;cursor:pointer;" data-placement="left" title="Delete" onmouseenter="$(this).tooltip(\'show\')" ng-click="grid.appScope.getRowData(row,\'Delete\')"></i></p></p>';
$scope.gridOptions = { $scope.gridOptions = {
......
src/main/webapp/WEB-INF/controllers/ProjectController.js
View file @ d07aff9a
...@@ -181,9 +181,9 @@ myApp.controller("projectController", function ($scope, myFactory, exportUiGridS ...@@ -181,9 +181,9 @@ myApp.controller("projectController", function ($scope, myFactory, exportUiGridS
locals: { dataToPass: userData, gridOptionsData: $scope.gridOptions.data, managers: $scope.managers }, locals: { dataToPass: userData, gridOptionsData: $scope.gridOptions.data, managers: $scope.managers },
}) })
.then(function (result) { .then(function (result) {
if (result == "Assign") showAlert('Manager assigned successfully'); if (result == "Assign") {showAlert('Manager assigned successfully');}
else if (result == "Update") showAlert('Manager updated successfully'); else if (result == "Update") showAlert('Manager updated successfully');
else if (result == "Cancelled") console.log(result); else if (result == "Cancelled") {console.log(result); $scope.getProjects();}
else showAlert('Manager assigning/updation failed!!!'); else showAlert('Manager assigning/updation failed!!!');
}); });
}; };
...@@ -734,6 +734,7 @@ myApp.controller("projectController", function ($scope, myFactory, exportUiGridS ...@@ -734,6 +734,7 @@ myApp.controller("projectController", function ($scope, myFactory, exportUiGridS
addRecord(record,action); addRecord(record,action);
$timeout(function(){ $timeout(function(){
updateGrid('Add',record); updateGrid('Add',record);
$scope.getPro
removeTab('Add'); removeTab('Add');
$mdDialog.show($mdDialog.alert({ $mdDialog.show($mdDialog.alert({
skipHide: true, skipHide: true,
......
src/main/webapp/WEB-INF/controllers/assignAccountsController.js
View file @ d07aff9a
...@@ -9,8 +9,8 @@ myApp.controller("assignAccountsController",function($scope, myFactory, $mdDialo ...@@ -9,8 +9,8 @@ myApp.controller("assignAccountsController",function($scope, myFactory, $mdDialo
"action":"", "action":"",
"clientAddress":"" "clientAddress":""
}; };
var getCellTemplate = '<p class="col-lg-12"><i class="fa fa-pencil-square-o fa-2x" aria-hidden="true" style="font-size:1.5em;margin-top:3px;cursor:pointer;" data-placement="center" title="Edit" onmouseenter="$(this).tooltip(\'show\')" ng-click="grid.appScope.getRowData(row,\'Update\')"></i>'+ var getCellTemplate = '<p class="col-lg-12"><p class="col-lg-4"><i class="fa fa-pencil-square-o fa-2x" ng-show="row.entity.status == \'Active\'" aria-hidden="true" style="font-size:1.5em;margin-top:3px;cursor:pointer;" data-placement="center" title="Edit" onmouseenter="$(this).tooltip(\'show\')" ng-click="grid.appScope.getRowData(row,\'Update\')"></i></p>'+
'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<i class="fa fa-minus-circle fa-2x" aria-hidden="true" style="font-size:1.5em;margin-top:3px;cursor:pointer;" data-placement="left" title="Delete" onmouseenter="$(this).tooltip(\'show\')" ng-click="grid.appScope.getRowData(row,\'Delete\')"></i></p>'; '<p class="col-lg-4"><i class="fa fa-minus-circle fa-2x" aria-hidden="true" style="font-size:1.5em;margin-top:3px;cursor:pointer;" data-placement="left" title="Delete" onmouseenter="$(this).tooltip(\'show\')" ng-click="grid.appScope.getRowData(row,\'Delete\')"></i></p></p>';
$scope.gridOptions = { $scope.gridOptions = {
paginationPageSizes : [ 10, 20, 30, 40, 50, 100], paginationPageSizes : [ 10, 20, 30, 40, 50, 100],
paginationPageSize : 50, paginationPageSize : 50,
......
src/main/webapp/WEB-INF/templates/projects.html
View file @ d07aff9a
...@@ -15,6 +15,16 @@ ...@@ -15,6 +15,16 @@
<div class="clearfix"></div> <div class="clearfix"></div>
</div> </div>
</div> </div>
<div class="row col-lg-12">
<div class="col-lg-8">
<md-button class="md-raised md-primary"
style="width:142px;background: cadetblue; margin: 2% 0% 0% 124%;"
ng-click="addProject('Assign', parentData)"> <i
class="fa fa-plus-circle fa-2x"
style="margin-top: 5px; font-size: 1.5em; float: left"></i> Add
Project</md-button>
</div>
</div>
<div class="row col-lg-12" style="height: 15px;"></div> <div class="row col-lg-12" style="height: 15px;"></div>
<div class="row col-lg-12" style="margin-left: 0px;"> <div class="row col-lg-12" style="margin-left: 0px;">
...@@ -40,13 +50,13 @@ ...@@ -40,13 +50,13 @@
class="fa fa-product-hunt fa-2x" class="fa fa-product-hunt fa-2x"
style="margin-top: 5px; font-size: 1.5em; float: left"></i>Project Allocations</md-button> style="margin-top: 5px; font-size: 1.5em; float: left"></i>Project Allocations</md-button>
</div> --> </div> -->
<div class="col-lg-4 text-center"> <!-- <div class="col-lg-4 text-center">
<md-button class="md-raised md-primary" <md-button class="md-raised md-primary"
style="width:142px;background: cadetblue; margin: 0% 0% 0% 124%;" style="width:142px;background: cadetblue; margin: 0% 0% 0% 124%;"
ng-click="addProject('Assign', parentData)"> <i ng-click="addProject('Assign', parentData)"> <i
class="fa fa-plus-circle fa-2x" class="fa fa-plus-circle fa-2x"
style="margin-top: 5px; font-size: 1.5em; float: left"></i> Add style="margin-top: 5px; font-size: 1.5em; float: left"></i> Add
Project</md-button> Project</md-button>
</div> </div> -->
</div> </div>
</div> </div>
\ No newline at end of file
src/main/webapp/WEB-INF/templates/roles.html
View file @ d07aff9a
...@@ -21,7 +21,19 @@ ...@@ -21,7 +21,19 @@
<div class="clearfix"></div> <div class="clearfix"></div>
</div> </div>
</div> </div>
<br/> <div class="row col-lg-12">
<div class="col-lg-8">
<label class="" for="submitBtn"> </label>
<md-button
class="md-raised md-primary"
style="width:142px;background: cadetblue; margin: 2% 0% 0% 124%;"
ng-click="assignRole('Add', parentData)"> <i
class="fa fa-plus-circle fa-2x"
style="margin-top: 5px; font-size: 1.5em; float: left"></i> Add
Employee</md-button>
<!-- </label> -->
</div>
</div>
<div class="form-group col-lg-7 col-md-7 col-sm-7 col-xs-12"></div> <div class="form-group col-lg-7 col-md-7 col-sm-7 col-xs-12"></div>
<div class="row col-lg-12" style="margin-left: 0px;"> <div class="row col-lg-12" style="margin-left: 0px;">
<input type="radio" ng-model="status" value="Active" ng-click="getUserRoles()"> Active <input type="radio" ng-model="status" value="Active" ng-click="getUserRoles()"> Active
...@@ -59,7 +71,7 @@ ...@@ -59,7 +71,7 @@
</div> </div>
</div> --> </div> -->
<!-- <div class="form-group col-lg-7 col-md-7 col-sm-7 col-xs-12"></div> --> <!-- <div class="form-group col-lg-7 col-md-7 col-sm-7 col-xs-12"></div> -->
<div class="form-group col-lg-2" style="margin-top: 30px;margin-left: 355px;"> <!-- <div class="form-group col-lg-2" style="margin-top: 30px;margin-left: 355px;">
<label class="" for="submitBtn"><md-button <label class="" for="submitBtn"><md-button
class="md-raised md-primary" class="md-raised md-primary"
style="width:142px;background: cadetblue;margin:0px;" style="width:142px;background: cadetblue;margin:0px;"
...@@ -67,7 +79,7 @@ ...@@ -67,7 +79,7 @@
class="fa fa-plus-circle fa-2x" class="fa fa-plus-circle fa-2x"
style="margin-top: 5px; font-size: 1.5em; float: left"></i> Add style="margin-top: 5px; font-size: 1.5em; float: left"></i> Add
Employee</md-button></label> Employee</md-button></label>
</div> </div> -->
</div> </div>
</div> </div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment