Unverified Commit 6148852a authored by mduppanapudi-nisum-com's avatar mduppanapudi-nisum-com Committed by GitHub

Merge pull request #191 from nisum-inc/MyTeam_NewDesign

My team new design
parents e38dc67d b9bb60c0
...@@ -54,5 +54,10 @@ myApp.controller("headerController",function($scope, myFactory, $compile, $mdDia ...@@ -54,5 +54,10 @@ myApp.controller("headerController",function($scope, myFactory, $compile, $mdDia
function ProgressController($scope) { function ProgressController($scope) {
$scope.progressText = "Please wait!!! Logging out from My Team."; $scope.progressText = "Please wait!!! Logging out from My Team.";
};
// For Left Menu Toggle
$scope.menuIcon=function(){
$('#sidebar-left').toggleClass("small-menu");
} }
}); });
\ No newline at end of file
This diff is collapsed.
<div class="md-padding" style="width: 100%; padding: 3px 0px 0px 0px;" <div class="md-padding" id="Container" ng-controller="assignAccountsController"
id="Container" ng-controller="assignAccountsController"
ng-init="getAccountDetails()"> ng-init="getAccountDetails()">
<div class="container-fluid mainDivHeaderClass"> <div class="container-fluid mainDivHeaderClass">
<div class="row"> <div class="row">
<div class="col-lg-12"> <div class="col-lg-12">
<p align="center" class="col-xs-11" <h1 class="no-padding">Manage Accounts
style="vertical-align: middle; font-weight: bold; font-size: 30px;">Manage Accounts</p> <span class="right">
<p align="right" class="col-xs-1" <md-button class="md-raised md-primary add-btn"
style="vertical-align: middle; font-weight: bold; font-size: 1.5em; margin-top: 8px; cursor: pointer;"> ng-click="addAccount('Add', parentData)"> <i
<i class="fa fa-refresh" aria-hidden="true" class="fa fa-plus-circle fa-1x"></i> Add Account</md-button>
ng-click="refreshPage()"></i> <i class="fa fa-refresh" aria-hidden="true" ng-click="refreshPage()"></i>
</p> </span>
</h1>
</div> </div>
<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="addAccount('Add', parentData)"> <i
class="fa fa-plus-circle fa-2x"
style="margin-top: 5px; font-size: 1.5em; float: left"></i> Add
Account</md-button>
</div>
</div>
<div class="row col-lg-12" style="height: 15px;"></div> <div class="row col-lg-12">
<div class="row col-lg-12" style="margin-left: 0px;">
<div id="gridTest" ui-grid="gridOptions" ui-grid-pagination <div id="gridTest" ui-grid="gridOptions" ui-grid-pagination
class="myGrid" style="width:99%;height:370px;margin-left:0px;"> class="myGrid">
<div class="watermark" ng-show="!gridOptions.data.length">No <div class="watermark" ng-show="!gridOptions.data.length">No
data available</div> data available</div>
</div> </div>
</div> </div>
<div class="row col-lg-12" style="height: 15px;"></div>
</div> </div>
\ No newline at end of file
<div class="md-padding" style="width: 100%; padding: 3px 0px 0px 0px;" <div class="md-padding" id="popupContainer" ng-controller="domainController"
id="popupContainer" ng-controller="domainController"
ng-init="getDomains();getEmployeesToTeam();"> ng-init="getDomains();getEmployeesToTeam();">
<div class="container-fluid mainDivHeaderClass"> <div class="container-fluid mainDivHeaderClass">
<div class="row"> <div class="row">
<div class="col-lg-12"> <div class="col-lg-12">
<p align="center" class="col-xs-11" <h1 class="no-padding">Manage Domains
style="vertical-align: middle; font-weight: bold; font-size: 30px;">Manage <span class="right">
Domains</p> <md-button class="add-btn md-raised md-primary"
<p align="right" class="col-xs-1" ng-click="addDomain('Add', parentData)"> <i
style="vertical-align: middle; font-weight: bold; font-size: 1.5em; margin-top: 8px; cursor: pointer;"> class="fa fa-plus-circle fa-1x"></i>Add
<i class="fa fa-refresh" aria-hidden="true" Domain </md-button>
ng-click="refreshPage()"></i> <i class="fa fa-refresh" aria-hidden="true" ng-click="refreshPage()"></i>
</p> </span>
</div> </h1>
</div>
<div class="clearfix"></div> <div class="clearfix"></div>
</div> </div>
</div> </div>
<div class="row col-lg-12" style="height: 15px;"></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: 0% 0% 0% 124%;"
ng-click="addDomain('Add', parentData)"> <i
class="fa fa-plus-circle fa-2x"
style="margin-top: 5px; font-size: 1.5em; float: left"></i> Add
Domain </md-button>
</div>
</div>
<div class="row col-lg-12" style="margin-left: 0px; margin-top: 10px"> <div class="row col-lg-12" style="margin-left: 0px; margin-top: 10px">
<div id="gridTest" ui-grid="gridOptions" ui-grid-pagination <div id="gridTest" ui-grid="gridOptions" ui-grid-pagination
class="myGrid" style="width: 99%; height: 370px; margin-left: 0px;"> class="myGrid" style="width: 99%; height: 370px; margin-left: 0px;">
......
<div class="md-padding" id="popupContainer" ng-controller="employeeController"
<div class="md-padding" style="width: 100%; padding: 3px 0px 0px 0px;"
id="popupContainer" ng-controller="employeeController"
ng-init="getEmployeeData()"> ng-init="getEmployeeData()">
<div class="container-fluid mainDivHeaderClass"> <div class="container-fluid mainDivHeaderClass">
<div class="row"> <div class="row">
<div class="col-lg-12"> <div class="col-lg-12">
<p align="center" class="col-xs-11" <h1 class="no-padding">My Login Details
style="vertical-align: middle; font-weight: bold; font-size: 30px;">My <a class="right">
Login Details</p> <i class="fa fa-refresh" aria-hidden="true" ng-click="refreshPage()"></i></a>
<p align="right" class="col-xs-1" </h1>
style="vertical-align: middle; font-weight: bold; font-size: 1.5em; margin-top: 8px; cursor: pointer;">
<i class="fa fa-refresh" aria-hidden="true"
ng-click="refreshPage()"></i>
</p>
</div> </div>
<div class="clearfix"></div> <div class="clearfix"></div>
</div> </div>
</div> </div>
<br />
<div class="form-horizontal"> <div class="form-horizontal">
<div class="form-group" style="padding-left:10px;"> <div class="form-group">
<div class="form-inline col-lg-12 col-sm-offset-1"> <div class="form-inline col-lg-12">
<div class="form-group col-lg-4"> <div class="form-group col-lg-4 col-sm-4">
<label class="control-label" for="empId">Employee ID: </label> <label class="control-label" for="empId">Employee ID: </label>
{{empId}} {{empId}}
</div> </div>
<div class="form-group col-lg-4"> <div class="form-group col-lg-4 col-sm-5">
<label class="control-label" for="empName">Employee Name: </label> <label class="control-label" for="empName">Employee Name: </label>
{{empName}} {{empName}}
</div> </div>
<div class="form-group col-lg-4"> <div class="form-group col-lg-4 col-sm-4">
<label class="control-label" for="email">Email: </label> <label class="control-label" for="email">Email: </label>
{{empEmailId}} {{empEmailId}}
</div> </div>
</div> </div>
</div> </div>
<div class="form-group" style="padding-left:10px;"> <div class="form-group">
<div class="form-inline col-lg-12 col-sm-offset-1"> <div class="form-inline col-lg-12">
<div class="form-group col-lg-4"> <div class="form-group col-lg-4 col-sm-5">
<label class="control-label" for="fromDate">From Date: <label class="control-label" for="fromDate">From Date:
<md-datepicker ng-model="fromDate" md-placeholder="Enter date" <md-datepicker ng-model="fromDate" md-placeholder="Enter date"
md-max-date="maxDate" onkeydown="return false" md-max-date="maxDate" onkeydown="return false"
ng-change="validateDates(fromDate, 'FromDate')"></md-datepicker></label> ng-change="validateDates(fromDate, 'FromDate')"></md-datepicker></label>
</div> </div>
<div class="form-group col-lg-4"> <div class="form-group col-lg-4 col-sm-5">
<label class="control-label" for="toDate">To Date: <label class="control-label" for="toDate">To Date:
<md-datepicker ng-model="toDate" md-placeholder="Enter date" <md-datepicker ng-model="toDate" md-placeholder="Enter date"
md-max-date="maxDate" onkeydown="return false" md-max-date="maxDate" onkeydown="return false"
ng-change="validateDates(toDate, 'ToDate')"></md-datepicker></label> ng-change="validateDates(toDate, 'ToDate')"></md-datepicker></label>
</div> </div>
<div class="form-group col-lg-4"> <div class="form-group col-lg-4 col-sm-2">
<label for="submitBtn"> <md-button <label for="submitBtn"> <md-button
class="md-raised md-primary" class="md-raised md-primary"
style="width:100px;background: cadetblue;"
ng-click="getEmployeeData()"> <i ng-click="getEmployeeData()"> <i
class="fa fa-search fa-2x" class="fa fa-search fa-2x"></i> Search</md-button></label>
style="margin-top: 5px; font-size: 1.5em;"></i> Search</md-button></label>
</div> </div>
</div> </div>
</div> </div>
<div class="form-group" style="padding-left:10px;"> <div class="form-group">
<div class="form-inline col-lg-12 col-sm-offset-1"> <div class="form-inline col-lg-12 col-sm-12">
<label class="control-label" for="avgHrs"> <label class="control-label" for="avgHrs">
Average Login hours:&nbsp;&nbsp; </label>{{avgLoginHrs}} Average Login hours:&nbsp;&nbsp; </label>{{avgLoginHrs}}
</div> </div>
...@@ -68,7 +59,7 @@ ...@@ -68,7 +59,7 @@
<div class="form-group"> <div class="form-group">
<div class="form-inline col-lg-12"> <div class="form-inline col-lg-12">
<div id="gridTest" ui-grid="gridOptions" ui-grid-pagination <div id="gridTest" ui-grid="gridOptions" ui-grid-pagination
class="myGrid" style="width:99%; height:300px;"> class="myGrid">
<div class="watermark" ng-show="!gridOptions.data.length">No <div class="watermark" ng-show="!gridOptions.data.length">No
data available</div> data available</div>
</div> </div>
......
<footer> <footer>
<nav class="navbar navbar-fixed-bottom navbar-inverse" <nav class="navbar navbar-fixed-bottom navbar-inverse"
role="navigation"> role="navigation">
<div class="row col-lg-12"> <div class="footer">
<div class="col-lg-11 col-xs-8 text-center"> <div class="col-lg-1 col-xs-3 copyrights">
<p style="padding-top:15px;">&copy Nisum <p>&copy Nisum Consulting Ltd 2018</p>
Consulting Ltd 2018</p>
</div> </div>
<div class="col-lg-1 col-xs-2"> <div class="col-lg-10 col-xs-9">
<img class="img img-rounded" src="images/logo.png" style="width:180px;height:45px;margin-left:-55px;"/> <img class="img img-rounded right" alt="nisum" src="images/nisum-small.png"/>
</div> </div>
</div> </div>
</nav> </nav>
......
...@@ -8,42 +8,35 @@ ...@@ -8,42 +8,35 @@
class="icon-bar"></span> <span class="icon-bar"></span> <span class="icon-bar"></span> <span class="icon-bar"></span> <span
class="icon-bar"></span> class="icon-bar"></span>
</button> </button>
<img src="images/nisum-logo1.png" width="200" height="50" style="padding-left: 20px"/> <img src="images/myteam.png" width="200" height="50" alt="myTeam"/>
</div> </div>
<div class="collapse navbar-collapse" id="b-menu-1"> <div class="collapse navbar-collapse" id="b-menu-1">
<a href="#" class="left menu-icon" ng-click="menuIcon()"><i class="fa fa-bars" aria-hidden="true"></i></a>
<ul class="nav navbar-nav navbar-right"> <ul class="nav navbar-nav navbar-right">
<li class="active"><a href="#">Signed in as <b>{{empName}}</b></a></li> <li class="active"><a href="#">Signed in as <b>{{empName}}</b></a></li>
<li class="dropdown active"><a href="#" class="dropdown-toggle" <li class="dropdown active"><a href="#" class="dropdown-toggle"
data-toggle="dropdown"> <i class="fa fa-user-circle-o fa-2x" aria-hidden="true" data-toggle="dropdown"> <i class="fa fa-user-circle-o fa-2x" aria-hidden="true"></i><b class="caret"></b>
style="font-size: 1.5em;"></i><b class="caret" style="margin-top:-4px;"></b>
</a> </a>
<ul class="dropdown-menu"> <ul class="dropdown-menu my-account">
<li> <li>
<div class="col-lg-12" style="padding-right: 5px;padding-left: 5px;"> <div class="col-lg-12 no-padding">
<div class="card hovercard"> <div class="card hovercard">
<div class="cardheader"></div> <div class="cardheader"></div>
<div class="avatar"> <div class="avatar left">
<img ng-alt="{{empName}}" ng-src="{{profilePicUrl}}"> <img ng-alt="{{empName}}" ng-src="{{profilePicUrl}}">
</div> </div>
<div class="info"> <div class="info right">
<div class="title">{{empName}}</div> <div class="title">{{empName}}</div>
<div style="height:5px;"></div>
<div class="desc"> <div class="desc">
<i class="fa fa-id-badge fa-2x" aria-hidden="true" <i class="fa fa-id-badge fa-2x" aria-hidden="true"></i> {{empId}}
style="font-size: 1.3em;"></i> {{empId}}
</div> </div>
<div style="height:5px;"></div>
<div class="desc"> <div class="desc">
<i class="fa fa-envelope fa-2x" aria-hidden="true" <i class="fa fa-envelope fa-2x" aria-hidden="true"></i> {{empEmailId}}
style="font-size: 1.3em;"></i> {{empEmailId}}
</div> </div>
<div style="height:5px;"></div>
<div class="desc"> <div class="desc">
<a href="#" ng-click="logout()" <a href="#" ng-click="logout()"><i
style="padding: 3px 0px; color: #fff;"><i class="fa fa-sign-out fa-2x" aria-hidden="true"></i> Logout</a>
class="fa fa-sign-out fa-2x" aria-hidden="true"
style="font-size: 1.5em;"></i> Logout</a>
</div> </div>
</div> </div>
</div> </div>
......
<html> <html>
<body> <body>
<header id="header" ng-include="'templates/header.html'" ng-controller="headerController"></header> <header id="header" ng-include="'templates/header.html'" ng-controller="headerController"></header>
<div id="sidebar-left" ng-include="'templates/leftmenu.html'" ng-controller="leftmenuController"></div> <div class="main-container">
<div id="main" ng-include="'templates/employee.html'"></div> <div id="sidebar-left" ng-include="'templates/leftmenu.html'" ng-controller="leftmenuController"></div>
<div id="main" ng-include="'templates/employee.html'"></div>
</div>
<footer id="footer" ng-include="'templates/footer.html'"></footer> <footer id="footer" ng-include="'templates/footer.html'"></footer>
</body> </body>
</html> </html>
\ No newline at end of file
...@@ -31,7 +31,8 @@ ...@@ -31,7 +31,8 @@
<script src="js/pdf/angular-pdf.min.js"></script> <script src="js/pdf/angular-pdf.min.js"></script>
<script src="js/pdf/print.min.js"></script> <script src="js/pdf/print.min.js"></script>
<link rel="stylesheet" href="css/bootstrap.min.css"></link> <link rel="stylesheet" href="css/bootstrap.min.css"></link>
<link rel="stylesheet" href="css/default-styles.css"></link> <!-- <link rel="stylesheet" href="css/default-styles.css"></link> -->
<link rel="stylesheet" href="css/custom-theme.css"></link>
<script src="js/bootstrap.min.js"></script> <script src="js/bootstrap.min.js"></script>
<script src="js/angular-idle.js"></script> <script src="js/angular-idle.js"></script>
<script src="http://ui-grid.info/release/ui-grid.js"></script> <script src="http://ui-grid.info/release/ui-grid.js"></script>
...@@ -46,9 +47,9 @@ ...@@ -46,9 +47,9 @@
<link rel="stylesheet" href="http://ui-grid.info/release/ui-grid.css" type="text/css"> <link rel="stylesheet" href="http://ui-grid.info/release/ui-grid.css" type="text/css">
<link rel="stylesheet" href="css/leftmenu.css"></link> <!-- <link rel="stylesheet" href="css/leftmenu.css"></link> -->
<link rel="stylesheet" href="css/pdf-viewer.css"></link> <link rel="stylesheet" href="css/pdf-viewer.css"></link>
<link rel="stylesheet" href="css/user-profile.css"></link> <!-- <link rel="stylesheet" href="css/user-profile.css"></link> -->
<script src="js/app.js"></script> <script src="js/app.js"></script>
<script src="js/date-text-filter.js"></script> <script src="js/date-text-filter.js"></script>
<script src="js/ui-grid-edit-datepicker.js"></script> <script src="js/ui-grid-edit-datepicker.js"></script>
......
...@@ -10,13 +10,13 @@ ...@@ -10,13 +10,13 @@
aria-hidden="false"> </i> <span style="margin-left: 15px;">{{manageItem.menu}}</span></a></i> aria-hidden="false"> </i> <span style="margin-left: 15px;">{{manageItem.menu}}</span></a></i>
</li> --> </li> -->
<li> <a href="#" ng-click="toggleManage()" ng-show="manageGroup.length > 0"> <i class="fa fa-users" style="font-size: 1.5em; margin-right: 15px;" aria-hidden="true"></i> Manage Group <i class="fa fa-caret-down" style="margin-left: 15px;"></i></a> <li> <a href="#" ng-click="toggleManage()" ng-show="manageGroup.length > 0"> <i class="fa fa-users" aria-hidden="true"></i> <span>Manage Group</span> <i class="fa fa-angle-down right"></i></a>
<ul ng-hide="custom" class="manageGroup"> <ul ng-hide="custom" class="manageGroup">
<li ng-repeat="manageItem in manageGroup"> <li ng-repeat="manageItem in manageGroup">
<a href="#" class="navbarMenu" ng-click="setTemplateUrl(manageItem.path)"><i <a href="#" class="navbarMenu" ng-click="setTemplateUrl(manageItem.path)"><i
class="{{manageItem.icon}}" style="font-size: 1.5em;" class="{{manageItem.icon}}"
aria-hidden="false"> </i> <span style="margin-left: 15px;">{{manageItem.menu}}</span></a></i> aria-hidden="false"> </i> <span>{{manageItem.menu}}</span></a></i>
</li> </li>
</ul> </ul>
...@@ -24,8 +24,8 @@ ...@@ -24,8 +24,8 @@
<li ng-repeat="nonManageItem in nonManageGroup" ng-click="togglenonManage()" class="nonManageGroup"> <li ng-repeat="nonManageItem in nonManageGroup" ng-click="togglenonManage()" class="nonManageGroup">
<a href="#" class="navbarMenu" ng-click="setTemplateUrl(nonManageItem.path)"> <a href="#" class="navbarMenu" ng-click="setTemplateUrl(nonManageItem.path)">
<i class="{{nonManageItem.icon}}" style="font-size: 1.5em;" aria-hidden="false"></i> <i class="{{nonManageItem.icon}}" aria-hidden="false"></i>
<span style="margin-left: 15px;">{{nonManageItem.menu}}</span> <span>{{nonManageItem.menu}}</span>
</a> </a>
</li> </li>
......
<div class="md-padding" style="width: 100%; padding: 3px 0px 0px 0px;" <div class="md-padding" id="popupContainer" ng-controller="assignRoleController"
id="popupContainer" ng-controller="assignRoleController"
ng-init="getOrgEmps()"> ng-init="getOrgEmps()">
<div class="container-fluid mainDivHeaderClass"> <div class="container-fluid mainDivHeaderClass">
<div class="row"> <div class="row">
<div class="col-lg-12"> <div class="col-lg-12">
<p align="center" class="col-xs-11" <h1 class="no-padding">My Org
style="vertical-align: middle; font-weight: bold; font-size: 30px;">My Org</p> <a class="right"><i class="fa fa-refresh" aria-hidden="true"
<p align="right" class="col-xs-1" ng-click="refreshPageOrg()"></i></a>
style="vertical-align: middle; font-weight: bold; font-size: 1.5em; margin-top: 8px; cursor: pointer;"> </h1>
<i class="fa fa-refresh" aria-hidden="true"
ng-click="refreshPageOrg()"></i>
</p>
</div> </div>
<div class="clearfix"></div> <div class="clearfix"></div>
</div> </div>
</div> </div>
<div class="row col-lg-12" style="height: 15px;"></div> <div class="row col-lg-12"></div>
<div class="row col-lg-12"> <div class="row">
<div class="col-lg-1" style="float: left;padding-left:20px;"> <div class="col-lg-1">
<!-- <div class="input-group" style="box-shadow: 1px 1px 1px 1px rgba(0,0,0,.26);"> <!-- <div class="input-group" style="box-shadow: 1px 1px 1px 1px rgba(0,0,0,.26);">
<input type="text" ng-model="empSearchId" id="empSearchId" <input type="text" ng-model="empSearchId" id="empSearchId"
ng-blur="validateEmpId()" class="form-control" ng-blur="validateEmpId()" class="form-control"
...@@ -31,8 +27,7 @@ ...@@ -31,8 +27,7 @@
</span> </span>
</div> --> </div> -->
</div> </div>
<div class="col-lg-1" <div class="col-lg-1">
style="cursor: pointer; float: right; right: 75px;">
<!-- <md-button class="md-raised md-primary" <!-- <md-button class="md-raised md-primary"
style="width:142px;background: cadetblue;" style="width:142px;background: cadetblue;"
ng-click="assignRole('Add', parentData)"> <i ng-click="assignRole('Add', parentData)"> <i
...@@ -41,13 +36,13 @@ ...@@ -41,13 +36,13 @@
Employee</md-button> --> Employee</md-button> -->
</div> </div>
</div> </div>
<div class="row col-lg-12" style="height: 15px;"></div> <div class="row">
<div class="row col-lg-12" style="margin-left: 0px;"> <div class="col-lg-12">
<div id="gridTest" ui-grid="gridOptionsOrgView" ui-grid-pagination
<div id="gridTest" ui-grid="gridOptionsOrgView" ui-grid-pagination class="myGrid">
class="myGrid" style="width:99%;height:370px;margin-left:0px;"> <div class="watermark" ng-show="!gridOptionsOrgView.data.length">No
<div class="watermark" ng-show="!gridOptionsOrgView.data.length">No data available</div>
data available</div> </div>
</div> </div>
</div> </div>
</div> </div>
\ No newline at end of file
<div class="md-padding" style="width: 100%; padding: 3px 0px 0px 0px;" <div class="md-padding" id="popupContainer" ng-controller="myProjectAllocationsController"
id="popupContainer" ng-controller="myProjectAllocationsController"
ng-init="getMyProjectAllocations()"> ng-init="getMyProjectAllocations()">
<div class="container-fluid mainDivHeaderClass"> <div class="container-fluid mainDivHeaderClass">
<div class="row"> <div class="row">
<div class="col-lg-12"> <div class="col-lg-12">
<p align="center" class="col-xs-11" <h1 class="no-padding">My Project Allocations
style="vertical-align: middle; font-weight: bold; font-size: 30px;">My Project Allocations </p> <a class="right"><i class="fa fa-refresh" aria-hidden="true"
<p align="right" class="col-xs-1" ng-click="refreshPage()"></i></a>
style="vertical-align: middle; font-weight: bold; font-size: 1.5em; margin-top: 8px; cursor: pointer;"> </h1>
<i class="fa fa-refresh" aria-hidden="true"
ng-click="refreshPage()"></i>
</p>
</div> </div>
<div class="clearfix"></div> <div class="clearfix"></div>
</div> </div>
</div> </div>
<div class="row col-lg-12" style="height: 15px;margin-left: 20px;"></div> <div class="row">
<div class="row col-lg-12"> <div class="col-lg-12">
<div class="col-xs-6" style="margin-left: 20px;"> <p><b>List of your current and previous project allocations: </b></p>
<p>
<b>List of your current and previous project allocations: </b>
</p>
</div>
</div> </div>
<div class="row col-lg-12" style="height: 15px;"></div> <div class="col-lg-12">
<div class="row col-lg-12" style="margin-left: 0px;"> <div id="gridTest" ui-grid="gridOptions" ui-grid-pagination
class="myGrid">
<div id="gridTest" ui-grid="gridOptions" ui-grid-pagination <div class="watermark" ng-show="!gridOptions.data.length">No
class="myGrid" style="width:99%;height:380px;" > data available</div>
<div class="watermark" ng-show="!gridOptions.data.length">No </div>
data available</div>
</div> </div>
</div> </div>
</div> </div>
\ No newline at end of file
<div class="md-padding" style="width: 100%; padding: 3px 0px 0px 0px;" <div class="md-padding" id="popupContainer" ng-controller="projectMyTeamController"
id="popupContainer" ng-controller="projectMyTeamController"
ng-init="getMyTeamDetails()"> ng-init="getMyTeamDetails()">
<div class="container-fluid mainDivHeaderClass"> <div class="container-fluid mainDivHeaderClass">
<div class="row"> <div class="row">
<div class="col-lg-12"> <div class="col-lg-12">
<p align="center" class="col-xs-11" <h1 class="no-padding">My Team</h1>
style="vertical-align: middle; font-weight: bold; font-size: 30px;">My Team </p>
<p align="right" class="col-xs-1"
style="vertical-align: middle; font-weight: bold; font-size: 1.5em; margin-top: 8px; cursor: pointer;">
<!-- <i class="fa fa-refresh" aria-hidden="true"
ng-click="refreshPage()"></i> -->
</p>
</div> </div>
<div class="clearfix"></div> <div class="clearfix"></div>
</div> </div>
</div> </div>
<div class="row col-lg-12" style="height: 15px;"></div> <div class="row">
<div class="row col-lg-12"> <div class="col-lg-12">
<div class="col-lg-1" style="float: left;padding-left:20px;"> <div id="gridTest" ui-grid="gridOptions" ui-grid-pagination
</div> class="myGrid">
<div class="col-lg-1" <div class="watermark" ng-show="!gridOptions.data.length">No
style="cursor: pointer; float: right; right: 75px;"> data available</div>
</div> </div>
</div>
<div class="row col-lg-12" style="height: 15px;"></div>
<div class="row col-lg-12" style="padding-top: 4%;margin-left:0px;">
<div id="gridTest" ui-grid="gridOptions" ui-grid-pagination
class="myGrid" style="width:99%;height:370px;margin-left:0px;">
<div class="watermark" ng-show="!gridOptions.data.length">No
data available</div>
</div> </div>
</div> </div>
</div> </div>
\ No newline at end of file
<div class="md-padding" style="width: 100%; padding: 3px 0px 0px 0px;" <div class="md-padding" id="popupContainer" ng-controller="travelController"
id="popupContainer" ng-controller="travelController"
ng-init="getEmpVisas();getEmployeesToTeam();"> ng-init="getEmpVisas();getEmployeesToTeam();">
<div class="container-fluid mainDivHeaderClass"> <div class="container-fluid mainDivHeaderClass">
<div class="row"> <div class="row">
<div class="col-lg-12"> <div class="col-lg-12">
<p align="center" class="col-xs-11" <h1 class="no-padding">Manage Travels
style="vertical-align: middle; font-weight: bold; font-size: 30px;">Manage Travels </p> <span class="right">
<p align="right" class="col-xs-1" <md-button class="add-btn md-raised md-primary" ng-click="assignRole('Add', parentData)">
style="vertical-align: middle; font-weight: bold; font-size: 1.5em; margin-top: 8px; cursor: pointer;"> <i class="fa fa-plus-circle fa-1x"></i> Add Travel Request</md-button>
<i class="fa fa-refresh" aria-hidden="true" <i class="fa fa-refresh" aria-hidden="true" ng-click="refreshPage()"></i>
ng-click="refreshPage()"></i> </span>
</p> </h1>
</div> </div>
<div class="clearfix"></div> <div class="clearfix"></div>
</div> </div>
</div> </div>
<div class="row col-lg-12" style="height: 15px;"></div>
<div class="row col-lg-12"> <div class="row col-lg-12">
<div class="col-lg-1" style="float: left;padding-left:20px;">
</div>
<div class="col-lg-1"
style="cursor: pointer; float: right; right: 75px;">
<md-button class="md-raised md-primary"
style="width:142px;background: cadetblue;"
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 Travel Request</md-button>
</div>
</div>
<div class="row col-lg-12" style="height: 15px;"></div>
<div class="row col-lg-12" style="margin-left: 0px;">
<div id="gridTest" ui-grid="gridOptions" ui-grid-pagination <div id="gridTest" ui-grid="gridOptions" ui-grid-pagination
class="grid" style="width:99%;height:380px;"> class="grid" style="width:99%;height:380px;">
......
...@@ -8,14 +8,12 @@ stroke:orange; ...@@ -8,14 +8,12 @@ stroke:orange;
} }
</style> </style>
</head> </head>
<md-dialog aria-label="Progress Template" style="width:420px;height:180px;background:transparent;" id="progressTemplate"> <md-dialog aria-label="Progress Template" id="progressTemplate">
<form ng-cloak name="myForm"> <form ng-cloak name="myForm">
<md-dialog-content> <md-dialog-content>
<div class="md-dialog-content"> <div class="md-dialog-content text-center">
<p <p> {{progressText}}</p>
style="color: #fff; font-size: 1.35em; vertical-align: middle; text-align:center;"> <i class="fa fa-gear fa-spin fa-5x fa-fw"></i>
{{progressText}}</p>
<i class="fa fa-spinner fa-pulse fa-3x fa-fw" style="left:42%;position:relative;color:orange;"></i>
</div> </div>
</md-dialog-content> </md-dialog-content>
</form> </form>
......
<div class="md-padding" style="width: 100%; padding: 3px 0px 0px 0px;" <div class="md-padding" id="popupContainer" ng-controller="projectController"
id="popupContainer" ng-controller="projectController"
ng-init="getProjects();getManagerDetails();"> ng-init="getProjects();getManagerDetails();">
<div class="container-fluid mainDivHeaderClass"> <div class="container-fluid mainDivHeaderClass">
<div class="row"> <div class="row">
<div class="col-lg-12"> <div class="col-lg-12">
<h1 class="no-padding">Manage Projects
<span class="right">
<md-button class="add-btn md-raised md-primary"
ng-click="addProject('Assign', parentData)"> <i
class="fa fa-plus-circle fa-1x"></i> Add
Project</md-button>
<i class="fa fa-refresh" aria-hidden="true" ng-click="refreshPage()"></i>
</span>
</h1>
</div>
<!-- <div class="col-lg-12">
<p align="center" class="col-xs-11" <p align="center" class="col-xs-11"
style="vertical-align: middle; font-weight: bold; font-size: 30px;">Manage Projects</p> style="vertical-align: middle; font-weight: bold; font-size: 30px;">Manage Projects</p>
<p align="right" class="col-xs-1" <p align="right" class="col-xs-1"
...@@ -11,22 +21,11 @@ ...@@ -11,22 +21,11 @@
<i class="fa fa-refresh" aria-hidden="true" <i class="fa fa-refresh" aria-hidden="true"
ng-click="refreshPage()"></i> ng-click="refreshPage()"></i>
</p> </p>
</div> </div> -->
<div class="clearfix"></div> <div class="clearfix"></div>
</div> </div>
</div> </div>
<div class="row col-lg-12"> <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="margin-left: 0px;">
<div id="gridTest" ui-grid="gridOptions" ui-grid-pagination <div id="gridTest" ui-grid="gridOptions" ui-grid-pagination
class="myGrid" style="width:99%;height:370px;margin-left:0px;"> class="myGrid" style="width:99%;height:370px;margin-left:0px;">
......
<style> <div class="md-padding" id="popupContainer" ng-controller="assignRoleController"
.grid-align {
text-align: left;
}
</style>
<div class="md-padding" style="width: 100%; padding: 3px 0px 0px 0px;"
id="popupContainer" ng-controller="assignRoleController"
ng-init="getUserRoles()"> ng-init="getUserRoles()">
<div class="container-fluid mainDivHeaderClass"> <div class="container-fluid mainDivHeaderClass">
<div class="row"> <div class="row">
<div class="col-lg-12"> <div class="col-lg-6">
<p align="center" class="col-xs-11" <h1 class="no-padding">Manage Employees</h1>
style="vertical-align: middle; font-weight: bold; font-size: 30px;">Manage </div>
Employees</p> <div class="col-lg-6 add-emp no-padding">
<p align="right" class="col-xs-1" <span>
style="vertical-align: middle; font-weight: bold; font-size: 1.5em; margin-top: 8px; cursor: pointer;"> <input type="radio" ng-model="status" value="Active" ng-click="getUserRoles()"> Active
<i class="fa fa-refresh" aria-hidden="true" <input type="radio" ng-model="status" value="In Active" ng-click="getUserRoles()"> Inactive
ng-click="refreshPage()"></i> <input type="radio" ng-model="status" value="both" ng-click="getUserRoles()"> Both
</p> </span>
<label class="" for="submitBtn"> </label>
<md-button
class="md-raised md-primary"
ng-click="assignRole('Add', parentData)"> <i
class="fa fa-plus-circle fa-2x"></i> Add Employee</md-button>
<i class="fa fa-refresh" aria-hidden="true" ng-click="refreshPage()"></i>
</div> </div>
<div class="clearfix"></div> <div class="clearfix"></div>
</div> </div>
</div> </div>
<div class="row col-lg-12"> <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="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="In Active" ng-click="getUserRoles()"> Inactive
<input type="radio" ng-model="status" value="both" ng-click="getUserRoles()"> Both
</div>
<div class="row col-lg-12" style="margin-left: 0px;">
<div id="gridTest" ui-grid="gridOptions" ui-grid-pagination <div id="gridTest" ui-grid="gridOptions" ui-grid-pagination
class="myGrid" style="width:99%;height:370px;margin-left:0px;"> class="myGrid">
<div class="watermark" ng-show="!gridOptions.data.length">No <div class="watermark" ng-show="!gridOptions.data.length">No
data available</div> data available</div>
...@@ -52,7 +32,7 @@ ...@@ -52,7 +32,7 @@
</div> </div>
<div class="form-horizontal"> <div class="form-horizontal">
<div class="form-group"> <div class="form-group">
<div class="form-inline col-lg-12" style="margin-left: 10px;"> <div class="form-inline col-lg-12">
<!-- <div class="form-group col-lg-3 col-md-4 col-sm-6 col-xs-12"> <!-- <div class="form-group col-lg-3 col-md-4 col-sm-6 col-xs-12">
<div class="input-group" <div class="input-group"
style=""> style="">
...@@ -85,5 +65,4 @@ ...@@ -85,5 +65,4 @@
</div> </div>
<div class="row col-lg-12" style="height: 15px;"></div>
</div> </div>
\ No newline at end of file
<div class="md-padding" style="width: 100%; padding: 3px 0px 0px 0px;" <div class="md-padding" id="popupContainer" ng-controller="visaController"
id="popupContainer" ng-controller="visaController"
ng-init="getEmpVisas();getEmployeesToTeam();"> ng-init="getEmpVisas();getEmployeesToTeam();">
<div class="container-fluid mainDivHeaderClass"> <div class="container-fluid mainDivHeaderClass">
<div class="row"> <div class="row">
<div class="col-lg-12"> <div class="col-lg-12">
<p align="center" class="col-xs-11" <h1 class="no-padding">Manage Visa
style="vertical-align: middle; font-weight: bold; font-size: 30px;">Manage Visa </p> <span class="right">
<p align="right" class="col-xs-1" <md-button class="add-btn md-raised md-primary"
style="vertical-align: middle; font-weight: bold; font-size: 1.5em; margin-top: 8px; cursor: pointer;"> ng-click="assignRole('Add', parentData)"> <i
<i class="fa fa-refresh" aria-hidden="true" class="fa fa-plus-circle fa-1x"></i> Add Visa Details</md-button>
ng-click="refreshPage()"></i> <i class="fa fa-refresh" aria-hidden="true" ng-click="refreshPage()"></i>
</p> </span>
</h1>
</div> </div>
<div class="clearfix"></div> <div class="clearfix"></div>
</div> </div>
</div> </div>
<div class="row col-lg-12" style="height: 15px;"></div>
<div class="row col-lg-12"> <div class="row col-lg-12">
<div class="col-lg-1" style="float: left;padding-left:20px;">
</div>
<div class="col-lg-1"
style="cursor: pointer; float: right; right: 75px;">
<md-button class="md-raised md-primary"
style="width:142px;background: cadetblue;"
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 Visa Details</md-button>
</div>
</div>
<div class="row col-lg-12" style="height: 15px;"></div>
<div class="row col-lg-12" style="margin-left: 0px;">
<div id="gridTest" ui-grid="gridOptions" ui-grid-pagination ui-grid-cell-contents <div id="gridTest" ui-grid="gridOptions" ui-grid-pagination ui-grid-cell-contents
class="grid" style="width:99%;height:380px;"> class="grid" style="width:99%;height:380px;">
......
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