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
Show 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
...@@ -219,3 +219,6 @@ md-select { ...@@ -219,3 +219,6 @@ md-select {
.md-datepicker-input-container{ .md-datepicker-input-container{
width: 160px; width: 160px;
} }
.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,64 +70,89 @@ ...@@ -70,64 +70,89 @@
</p> </p>
</div> </div>
</div> </div>
<md-select ng-model="employeeModel" data-md-container-class="selectHeader" md-selected-text="getEmployeeSelected() " id="selectEmp" name="employeeModel"> <table>
<tr>
<td>Select a Employee</td>
<td>
<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"> <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}}" <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" /> 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> <span class="glyphicon glyphicon-remove close-mdselect" ng-click="closeSelectBox()"></span>
</md-select-header> </md-select-header>
<md-optgroup label="Employee " class="optionScroll"> <md-optgroup label="Employee " class="optionScroll">
<md-option ng-value="employee " ng-repeat="employee in employeeList | filter:searchFilter">{{employee.employeeName}}</md-option> <md-option ng-value="employee " ng-repeat="employee in employeeList | filter:searchFilter">{{employee.employeeName}}</md-option>
</md-optgroup> </md-optgroup>
</md-select> </md-select>
<output>Employee Name : {{employeeModel.employeeName}}</output> </td>
<output>Employee Id : {{employeeModel.employeeId}}</output> </tr>
<output>Email Id : {{employeeModel.emailId}}</output> <tr>
<output>Role : {{employeeModel.role}}</output> <td class="Employee">Employee Name : </td>
<output>Designation : {{employeeModel.designation}}</output> <td>{{employeeModel.employeeName}}</td>
<md-select ng-model="employeeRole" </tr>
md-selected-text="getSelectedEmpRole()" <tr>
id="empRole" <td class="Employee"> Employee Id :</td>
name="employeeRole"> <td>{{employeeModel.employeeId}}</td>
<md-optgroup </tr>
label="employee role"> <tr>
<md-option <td class="Employee">Email Id :</td>
ng-value="empRole" <td>{{employeeModel.emailId}}</td>
ng-repeat="empRole in employeeRoles">{{empRole}}</md-option> </tr>
</md-optgroup> </md-select> <tr>
<md-select ng-model="employeeShift" <td class="Employee">Designation : </td>
md-selected-text="getSelectedEmpShift()" <td>{{employeeModel.designation}}</td>
id="empShift"> <md-optgroup </tr>
label="employee shift"> <md-option <tr>
ng-value="empShift" <td class="Employee"> Assigned Role</td>
ng-repeat="empShift in employeeShifts">{{empShift}}</md-option> <td>
</md-optgroup> </md-select> <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-select ng-model="empBillableStatus " md-selected-text="getSelectedBillableStatus() " id="empBillableStatus" name="empBillableStatus">
<md-optgroup label="billable statuses "> <md-optgroup label="billable statuses ">
<md-option ng-value="billableStatus " ng-repeat="billableStatus in billableStatuses ">{{billableStatus}}</md-option> <md-option ng-value="billableStatus " ng-repeat="billableStatus in billableStatuses ">{{billableStatus}}</md-option>
</md-optgroup> </md-optgroup>
</md-select> </md-select>
<table> </td>
</tr>
<tr ng-show="empBillableStatus"> <tr ng-show="empBillableStatus">
<td>{{empBillableStatus}} Start Date </td> <td class="Employee">{{empBillableStatus}} Start Date </td>
<td> <td>
<md-datepicker ng-model="newBillingStartDate" md-placeholder="Plase select Date " id="newBillingStartDate " md-min-date="minDate " md-max-date="maxDate " <md-datepicker ng-model="newBillingStartDate" md-placeholder="Plase select Date " id="newBillingStartDate " md-min-date="minDate "
onkeydown="return false " ng-change="currentBillabilityDateChange()"name="newBillingStartDate"></md-datepicker> md-max-date="maxDate " onkeydown="return false " ng-change="currentBillabilityDateChange()" 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 " ng-disabled="newBillingStartDate" 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>
...@@ -170,7 +195,10 @@ ...@@ -170,7 +195,10 @@
</div> </div>
<div class="col-xs-6 text-center "> <div class="col-xs-6 text-center ">
<p> <p>
<b>Manager Name: </b><span ng-repeat="manager in managerIds">{{manager.employeeName}}<span ng-hide="$last">,</span></span> <b>Manager Name:</b>
<span ng-repeat="manager in managerIds">{{manager.employeeName}}
<span ng-hide="$last">,</span>
</span>
</p> </p>
</div> </div>
</div> </div>
...@@ -184,45 +212,65 @@ ...@@ -184,45 +212,65 @@
<md-option ng-value="employee " ng-repeat="employee in employeeList | filter:searchFilter">{{employee.employeeName}}</md-option> <md-option ng-value="employee " ng-repeat="employee in employeeList | filter:searchFilter">{{employee.employeeName}}</md-option>
</md-optgroup> </md-optgroup>
</md-select> --> </md-select> -->
<output>Employee Name : {{employeeModel.employeeName}}</output> <table>
<output>Employee Id : {{employeeModel.employeeId}}</output> <tr>
<output>Email Id : {{employeeModel.emailId}}</output> <td class="Employee">Employee Name : </td>
<output>Role : {{employeeModel.role}}</output> <td>{{employeeModel.employeeName}}</td>
<output>Designation : {{employeeModel.designation}}</output> </tr>
<md-select ng-model="employeeRole" <tr>
md-selected-text="getSelectedEmpRole()" <td class="Employee"> Employee Id :</td>
id="empRole"> <md-optgroup <td>{{employeeModel.employeeId}}</td>
label="employee role"> <md-option </tr>
ng-value="empRole" <tr>
ng-repeat="empRole in employeeRoles">{{empRole}}</md-option> <td class="Employee">Email Id :</td>
</md-optgroup> </md-select> <td>{{employeeModel.emailId}}</td>
</tr>
<tr>
<md-select ng-model="employeeShift" <td class="Employee">Designation : </td>
md-selected-text="getSelectedEmpShift()" <td>{{employeeModel.designation}}</td>
id="empShift"> <md-optgroup </tr>
label="employee shift"> <md-option <tr>
ng-value="empShift" <td class="Employee"> Assigned Role</td>
ng-repeat="empShift in employeeShifts">{{empShift}}</md-option> <td>
</md-optgroup> </md-select> <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-select ng-model="empBillableStatus " md-selected-text="getSelectedBillableStatus() " id="empBillableStatus" name="empBillableStatus">
<md-optgroup label="billable statuses "> <md-optgroup label="billable statuses ">
<md-option ng-value="billableStatus " ng-repeat="billableStatus in billableStatuses ">{{billableStatus}}</md-option> <md-option ng-value="billableStatus " ng-repeat="billableStatus in billableStatuses ">{{billableStatus}}</md-option>
</md-optgroup> </md-optgroup>
</md-select> </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="Please select Date " id="newBillingStartDate " md-min-date="minDate " md-max-date="maxDate " <md-datepicker ng-model="newBillingStartDate" md-placeholder="Plase select Date " id="newBillingStartDate " md-min-date="minDate "
onkeydown="return false" name="newBillingStartDate"></md-datepicker> md-max-date="maxDate " onkeydown="return false " ng-change="currentBillabilityDateChange()"
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>
...@@ -230,7 +278,7 @@ ...@@ -230,7 +278,7 @@
</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>
......
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