Commit b1a63950 authored by Vijay Akula's avatar Vijay Akula

Merge branch 'FEATURE/NEW_ENHANCEMENT_MYTEAM' of...

Merge branch 'FEATURE/NEW_ENHANCEMENT_MYTEAM' of https://gitlab.mynisum.com/hr/mytime into FEATURE/NEW_ENHANCEMENT_MYTEAM
parents bec7a843 9dc37d71
...@@ -1611,7 +1611,7 @@ myApp.controller("projectController", function ($scope, myFactory, exportUiGridS ...@@ -1611,7 +1611,7 @@ myApp.controller("projectController", function ($scope, myFactory, exportUiGridS
data: record data: record
} }
$http(req).then(function mySuccess(response) { $http(req).then(function mySuccess(response) {
if(response.data.message == "Project name already exist !!! try with new"){ if(response.data.message == "Project is already existed"){
$mdDialog.show($mdDialog.alert({ $mdDialog.show($mdDialog.alert({
skipHide: true, skipHide: true,
title:'Attention', title:'Attention',
......
...@@ -152,7 +152,7 @@ ...@@ -152,7 +152,7 @@
</div> </div>
<br/><br/> <br/><br/>
</fieldset> </fieldset>
<fieldset> <!-- <fieldset>
<legend style="font-size: 18px;" >Passport and Visa Details <i style="margin-top:3px;color:blue;cursor:pointer;font-size: 14px;" ng-click="toggleVisaDisplay()">{{showOrHidePV}}</i></legend> <legend style="font-size: 18px;" >Passport and Visa Details <i style="margin-top:3px;color:blue;cursor:pointer;font-size: 14px;" ng-click="toggleVisaDisplay()">{{showOrHidePV}}</i></legend>
<div ng-show="showVisaDisplay"> <div ng-show="showVisaDisplay">
<div class="container col-lg-12" style="float: left; padding-left: 30px;"> <div class="container col-lg-12" style="float: left; padding-left: 30px;">
...@@ -187,7 +187,7 @@ ...@@ -187,7 +187,7 @@
</div> </div>
</div> </div>
<br/><br/> <br/><br/>
</fieldset> </fieldset> -->
<fieldset> <fieldset>
<legend style="font-size: 18px;" >Project Allocations <i style="margin-top:3px;color:blue;cursor:pointer;font-size:14px;" ng-click="toggleProjectAllocations()">{{showOrHidePA}}</i> <legend style="font-size: 18px;" >Project Allocations <i style="margin-top:3px;color:blue;cursor:pointer;font-size:14px;" ng-click="toggleProjectAllocations()">{{showOrHidePA}}</i>
</legend> </legend>
......
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