Skip to content

M
mytime
Commit 9ec32ced authored by nakavaram-nisum-com's avatar nakavaram-nisum-com Committed by rbonthala-nisum-com
Browse files
Options

cosmetic changes in manage projects view screen (#109)

parent 92498f16
Hide whitespace changes
Inline Side-by-side
Showing with 211 additions and 160 deletions
src/main/webapp/WEB-INF/css/default-styles.css
View file @ 9ec32ced
...@@ -218,4 +218,7 @@ md-select { ...@@ -218,4 +218,7 @@ md-select {
} }
.md-datepicker-input-container{ .md-datepicker-input-container{
width: 160px; width: 160px;
} }
\ No newline at end of file .form-group td.Employee {
padding: 12px 25px 12px 0;
}
\ No newline at end of file
src/main/webapp/WEB-INF/templates/projectTeamDetails.html
View file @ 9ec32ced
...@@ -70,173 +70,221 @@ ...@@ -70,173 +70,221 @@
</p> </p>
</div> </div>
</div> </div>
<md-select ng-model="employeeModel" data-md-container-class="selectHeader" md-selected-text="getEmployeeSelected() " id="selectEmp" name="employeeModel">
<md-select-header class="selectHeaderChild header-spacing" layout="column">
<input ng-model="searchTerm" type="search" id="search" ng-keydown="updateSearch($event)" ng-model-options="{debounce: {'default': 500, 'blur': 0}}"
placeholder="Please search for a employee" class="searchBoxHeader demo-header-searchbox md-text search-spacingleft" />
<span class="glyphicon glyphicon-remove close-mdselect" ng-click="closeSelectBox()"></span>
</md-select-header>
<md-optgroup label="Employee " class="optionScroll">
<md-option ng-value="employee " ng-repeat="employee in employeeList | filter:searchFilter">{{employee.employeeName}}</md-option>
</md-optgroup>
</md-select>
<output>Employee Name : {{employeeModel.employeeName}}</output>
<output>Employee Id : {{employeeModel.employeeId}}</output>
<output>Email Id : {{employeeModel.emailId}}</output>
<output>Role : {{employeeModel.role}}</output>
<output>Designation : {{employeeModel.designation}}</output>
<md-select ng-model="employeeRole"
md-selected-text="getSelectedEmpRole()"
id="empRole"
name="employeeRole">
<md-optgroup
label="employee role">
<md-option
ng-value="empRole"
ng-repeat="empRole in employeeRoles">{{empRole}}</md-option>
</md-optgroup> </md-select>
<md-select ng-model="employeeShift"
md-selected-text="getSelectedEmpShift()"
id="empShift"> <md-optgroup
label="employee shift"> <md-option
ng-value="empShift"
ng-repeat="empShift in employeeShifts">{{empShift}}</md-option>
</md-optgroup> </md-select>
<md-select ng-model="empBillableStatus " md-selected-text="getSelectedBillableStatus() " id="empBillableStatus" name="empBillableStatus">
<md-optgroup label="billable statuses ">
<md-option ng-value="billableStatus " ng-repeat="billableStatus in billableStatuses ">{{billableStatus}}</md-option>
</md-optgroup>
</md-select>
<table> <table>
<tr ng-show="empBillableStatus"> <tr>
<td>{{empBillableStatus}} Start Date </td> <td>Select a Employee</td>
<td> <td>
<md-datepicker ng-model="newBillingStartDate" md-placeholder="Plase select Date " id="newBillingStartDate " md-min-date="minDate " md-max-date="maxDate " <md-select ng-model="employeeModel" data-md-container-class="selectHeader" md-selected-text="getEmployeeSelected() " id="selectEmp"
onkeydown="return false " ng-change="currentBillabilityDateChange()"name="newBillingStartDate"></md-datepicker> name="employeeModel">
</td> <md-select-header class="selectHeaderChild header-spacing" layout="column">
</tr> <input ng-model="searchTerm" type="search" id="search" ng-keydown="updateSearch($event)" ng-model-options="{debounce: {'default': 500, 'blur': 0}}"
placeholder="Please search for a employee" class="searchBoxHeader demo-header-searchbox md-text search-spacingleft"
<tr> />
<td>Start Date</td> <span class="glyphicon glyphicon-remove close-mdselect" ng-click="closeSelectBox()"></span>
<td> </md-select-header>
<md-datepicker ng-model="startDate " md-placeholder="Please select Date " id="startDate " md-min-date="minDate " md-max-date="maxDate " <md-optgroup label="Employee " class="optionScroll">
onkeydown="return false " ng-disabled="newBillingStartDate" name="startDate"></md-datepicker> <md-option ng-value="employee " ng-repeat="employee in employeeList | filter:searchFilter">{{employee.employeeName}}</md-option>
</td> </md-optgroup>
</tr> </md-select>
</td>
</tr>
<tr>
<td class="Employee">Employee Name : </td>
<td>{{employeeModel.employeeName}}</td>
</tr>
<tr>
<td class="Employee"> Employee Id :</td>
<td>{{employeeModel.employeeId}}</td>
</tr>
<tr>
<td class="Employee">Email Id :</td>
<td>{{employeeModel.emailId}}</td>
</tr>
<tr>
<td class="Employee">Designation : </td>
<td>{{employeeModel.designation}}</td>
</tr>
<tr>
<td class="Employee"> Assigned Role</td>
<td>
<md-select ng-model="employeeRole" md-selected-text="getSelectedEmpRole()" id="empRole">
<md-optgroup label="employee role">
<md-option ng-value="empRole" ng-repeat="empRole in employeeRoles">{{empRole}}</md-option>
</md-optgroup>
</md-select>
</td>
</tr>
<tr>
<td class="Employee">Shift</td>
<td>
<md-select ng-model="employeeShift" md-selected-text="getSelectedEmpShift()" id="empShift">
<md-optgroup label="employee shift">
<md-option ng-value="empShift" ng-repeat="empShift in employeeShifts">{{empShift}}</md-option>
</md-optgroup>
</md-select>
</td>
</tr>
<tr>
<td class="Employee">Billability Status</td>
<td>
<md-select ng-model="empBillableStatus " md-selected-text="getSelectedBillableStatus() " id="empBillableStatus" name="empBillableStatus">
<md-optgroup label="billable statuses ">
<md-option ng-value="billableStatus " ng-repeat="billableStatus in billableStatuses ">{{billableStatus}}</md-option>
</md-optgroup>
</md-select>
</td>
</tr>
<tr ng-show="empBillableStatus">
<td class="Employee">{{empBillableStatus}} Start Date </td>
<td>
<md-datepicker ng-model="newBillingStartDate" md-placeholder="Plase select Date " id="newBillingStartDate " md-min-date="minDate "
md-max-date="maxDate " onkeydown="return false " ng-change="currentBillabilityDateChange()" name="newBillingStartDate"></md-datepicker>
</td>
</tr>
<tr>
<td class="Employee">Start Date</td>
<td>
<md-datepicker ng-model="startDate " md-placeholder="Please select Date" id="startDate " md-min-date="minDate " md-max-date="maxDate "
onkeydown="return false " name="startDate"></md-datepicker>
</td>
</tr>
<tr> <tr>
<td>End Date &nbsp</td> <td class="Employee">End Date</td>
<td> <td>
<md-datepicker ng-model="endDate " md-placeholder="Please select Date " id="endDate " md-min-date="minDate " md-max-date="maxDate " <md-datepicker ng-model="endDate " md-placeholder="Please select Date" id="endDate " md-min-date="minDate " md-max-date="maxDate "
onkeydown="return false " name="endDate"></md-datepicker> onkeydown="return false " name="endDate"></md-datepicker>
</td> </td>
</tr> </tr>
</table> </table>
<div role="alert "> <div role="alert ">
<span class="error " style="color: red; ">{{alertMsg}}</span> <span class="error " style="color: red; ">{{alertMsg}}</span>
</div> </div>
</div>
</div>
<md-dialog-actions layout="row ">
<md-button class="md-raised " data-ng-click="validateFields(templateTitle) " style="width:120px;background: cadetblue;color:white; ">Add
</md-button>
<md-button class="md-raised " ng-click="cancelTab() " style="width:120px;background: cadetblue;color:white; ">
Cancel </md-button>
</md-dialog-actions>
</form>
</md-content>
</md-tab>
<md-tab label="Update Team Mate" id="tab3">
<md-content class="md-padding ">
<form ng-cloak name="myForm" id="myForm">
<!-- <md-toolbar>
<div class="md-toolbar-tools " style="background: cadetblue; ">
<h2>Add Team Mate </h2>
<span flex></span>
<md-button class="md-icon-button " ng-click="cancel() ">
<i class="fa fa-times fa-2x " style="margin-top: 5px; font-size: 1.5em; float: left "></i>
</md-button>
</div>
</md-toolbar> -->
<div class="md-dialog-content ">
<div class="form-group ">
<div class="row col-lg-12 " style="margin-left: 0px; ">
<div class="row col-lg-12 col-xs-12 ">
<div class="col-xs-6 text-center ">
<p>
<b>Project Name:</b> {{projectName}}
</p>
</div>
<div class="col-xs-6 text-center ">
<p>
<b>Manager Name: </b><span ng-repeat="manager in managerIds">{{manager.employeeName}}<span ng-hide="$last">,</span></span>
</p>
</div>
</div> </div>
<!-- <md-select ng-model="employeeModel" data-md-container-class="selectHeader" md-selected-text="getEmployeeSelected() " id="selectEmp" name="employeeModel" ng-disabled="addOrUpdateFlag"> </div>
<md-select-header class="selectHeaderChild header-spacing" layout="column"> <md-dialog-actions layout="row ">
<input ng-model="searchTerm" type="search" id="search" ng-keydown="updateSearch($event)" ng-model-options="{debounce: {'default': 500, 'blur': 0}}" <md-button class="md-raised " data-ng-click="validateFields(templateTitle) " style="width:120px;background: cadetblue;color:white; ">Add
placeholder="Please search for a employee" class="searchBoxHeader demo-header-searchbox md-text search-spacingleft" /> </md-button>
<span class="glyphicon glyphicon-remove close-mdselect" ng-click="closeSelectBox()"></span> <md-button class="md-raised " ng-click="cancelTab() " style="width:120px;background: cadetblue;color:white; ">
</md-select-header> Cancel </md-button>
<md-optgroup label="Employee " class="optionScroll"> </md-dialog-actions>
<md-option ng-value="employee " ng-repeat="employee in employeeList | filter:searchFilter">{{employee.employeeName}}</md-option> </form>
</md-optgroup> </md-content>
</md-select> --> </md-tab>
<output>Employee Name : {{employeeModel.employeeName}}</output> <md-tab label="Update Team Mate" id="tab3">
<output>Employee Id : {{employeeModel.employeeId}}</output> <md-content class="md-padding ">
<output>Email Id : {{employeeModel.emailId}}</output> <form ng-cloak name="myForm" id="myForm">
<output>Role : {{employeeModel.role}}</output> <!-- <md-toolbar>
<output>Designation : {{employeeModel.designation}}</output> <div class="md-toolbar-tools " style="background: cadetblue; ">
<md-select ng-model="employeeRole" <h2>Add Team Mate </h2>
md-selected-text="getSelectedEmpRole()" <span flex></span>
id="empRole"> <md-optgroup <md-button class="md-icon-button " ng-click="cancel() ">
label="employee role"> <md-option <i class="fa fa-times fa-2x " style="margin-top: 5px; font-size: 1.5em; float: left "></i>
ng-value="empRole" </md-button>
ng-repeat="empRole in employeeRoles">{{empRole}}</md-option> </div>
</md-optgroup> </md-select> </md-toolbar> -->
<div class="md-dialog-content ">
<div class="form-group ">
<md-select ng-model="employeeShift" <div class="row col-lg-12 " style="margin-left: 0px; ">
md-selected-text="getSelectedEmpShift()" <div class="row col-lg-12 col-xs-12 ">
id="empShift"> <md-optgroup <div class="col-xs-6 text-center ">
label="employee shift"> <md-option <p>
ng-value="empShift" <b>Project Name:</b> {{projectName}}
ng-repeat="empShift in employeeShifts">{{empShift}}</md-option> </p>
</md-optgroup> </md-select> </div>
<div class="col-xs-6 text-center ">
<md-select ng-model="empBillableStatus " md-selected-text="getSelectedBillableStatus() " id="empBillableStatus" name="empBillableStatus"> <p>
<md-optgroup label="billable statuses "> <b>Manager Name:</b>
<md-option ng-value="billableStatus " ng-repeat="billableStatus in billableStatuses ">{{billableStatus}}</md-option> <span ng-repeat="manager in managerIds">{{manager.employeeName}}
</md-optgroup> <span ng-hide="$last">,</span>
</md-select> </span>
</p>
</div>
</div>
<!-- <md-select ng-model="employeeModel" data-md-container-class="selectHeader" md-selected-text="getEmployeeSelected() " id="selectEmp" name="employeeModel" ng-disabled="addOrUpdateFlag">
<md-select-header class="selectHeaderChild header-spacing" layout="column">
<input ng-model="searchTerm" type="search" id="search" ng-keydown="updateSearch($event)" ng-model-options="{debounce: {'default': 500, 'blur': 0}}"
placeholder="Please search for a employee" class="searchBoxHeader demo-header-searchbox md-text search-spacingleft" />
<span class="glyphicon glyphicon-remove close-mdselect" ng-click="closeSelectBox()"></span>
</md-select-header>
<md-optgroup label="Employee " class="optionScroll">
<md-option ng-value="employee " ng-repeat="employee in employeeList | filter:searchFilter">{{employee.employeeName}}</md-option>
</md-optgroup>
</md-select> -->
<table>
<tr>
<td class="Employee">Employee Name : </td>
<td>{{employeeModel.employeeName}}</td>
</tr>
<tr>
<td class="Employee"> Employee Id :</td>
<td>{{employeeModel.employeeId}}</td>
</tr>
<tr>
<td class="Employee">Email Id :</td>
<td>{{employeeModel.emailId}}</td>
</tr>
<tr>
<td class="Employee">Designation : </td>
<td>{{employeeModel.designation}}</td>
</tr>
<tr>
<td class="Employee"> Assigned Role</td>
<td>
<md-select ng-model="employeeRole" md-selected-text="getSelectedEmpRole()" id="empRole">
<md-optgroup label="employee role">
<md-option ng-value="empRole" ng-repeat="empRole in employeeRoles">{{empRole}}</md-option>
</md-optgroup>
</md-select>
</td>
</tr>
<tr>
<td class="Employee">Shift</td>
<td>
<md-select ng-model="employeeShift" md-selected-text="getSelectedEmpShift()" id="empShift">
<md-optgroup label="employee shift">
<md-option ng-value="empShift" ng-repeat="empShift in employeeShifts">{{empShift}}</md-option>
</md-optgroup>
</md-select>
</td>
</tr>
<tr>
<td class="Employee">Billability Status</td>
<td>
<md-select ng-model="empBillableStatus " md-selected-text="getSelectedBillableStatus() " id="empBillableStatus" name="empBillableStatus">
<md-optgroup label="billable statuses ">
<md-option ng-value="billableStatus " ng-repeat="billableStatus in billableStatuses ">{{billableStatus}}</md-option>
</md-optgroup>
</md-select>
</td>
</tr>
<table> <tr ng-show="empBillableStatus">
<tr ng-show="empBillableStatus"> <td>{{empBillableStatus}} Start Date </td>
<td>{{empBillableStatus}} Start Date </td> <td>
<td> <md-datepicker ng-model="newBillingStartDate" md-placeholder="Plase select Date " id="newBillingStartDate " md-min-date="minDate "
<md-datepicker ng-model="newBillingStartDate" md-placeholder="Please select Date " id="newBillingStartDate " md-min-date="minDate " md-max-date="maxDate " md-max-date="maxDate " onkeydown="return false " ng-change="currentBillabilityDateChange()"
onkeydown="return false" name="newBillingStartDate"></md-datepicker> name="newBillingStartDate"></md-datepicker>
</td> </td>
</tr> </tr>
<tr> <tr>
<td>Start Date</td> <td class="Employee">Start Date</td>
<td> <td>
<md-datepicker ng-model="startDate " md-placeholder="Please select Date" id="startDate " md-min-date="minDate " md-max-date="maxDate " <md-datepicker ng-model="startDate " md-placeholder="Please select Date" id="startDate " md-min-date="minDate " md-max-date="maxDate "
onkeydown="return false " name="startDate"></md-datepicker> onkeydown="return false " name="startDate"></md-datepicker>
</td> </td>
</tr> </tr>
<tr> <tr>
<td>End Date &nbsp</td> <td class="Employee">End Date</td>
<td> <td>
<md-datepicker ng-model="endDate " md-placeholder="Please select Date" id="endDate " md-min-date="minDate " md-max-date="maxDate " <md-datepicker ng-model="endDate " md-placeholder="Please select Date" id="endDate " md-min-date="minDate " md-max-date="maxDate "
onkeydown="return false " name="endDate"></md-datepicker> onkeydown="return false " name="endDate"></md-datepicker>
</td> </td>
</tr> </tr>
</table> </table>
<div role="alert "> <div role="alert ">
<span class="error " style="color: red; ">{{alertMsg}}</span> <span class="error " style="color: red; ">{{alertMsg}}</span>
......
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