Minor Updates: Minor updates in the dashboard and employee details pa…

…ges.
mahi-mullapudi · Sep 7, 2018 · 0270d7e · 0270d7e
1 parent 100fb0d
commit 0270d7e
Show file tree

Hide file tree

Showing 8 changed files with 90 additions and 92 deletions.
diff --git a/src/main/java/com/tutorialq/constants/QueryProperties.java b/src/main/java/com/tutorialq/constants/QueryProperties.java
@@ -15,4 +15,8 @@ public class QueryProperties {
  + " emp.employeeTitle = :employeeTitle, "
  + " emp.employeePhone = :employeePhone "
  + " WHERE emp.employeeId = :employeeId";
+
+ public final static String updatePassword = "UPDATE Employee emp "
+ + " SET emp.empPassword = :password "
+ + " WHERE emp.employeeEmailId = :emailId";
 }
diff --git a/src/main/java/com/tutorialq/repositories/EmployeeRepository.java b/src/main/java/com/tutorialq/repositories/EmployeeRepository.java
@@ -18,7 +18,7 @@ public interface EmployeeRepository extends JpaRepository<Employee, Long> {
  int countEmployeeByEmployeeEmailIdAndEmpPassword(String emailId, String password);
 
  @Modifying
- @Query("UPDATE Employee emp SET emp.empPassword = :password where emp.employeeEmailId = :emailId")
+ @Query(QueryProperties.updatePassword)
  int updatePassword(@Param("password") String password, @Param("emailId") String emailId);
 
  @Modifying

diff --git a/src/main/resources/static/js/dashboard.js b/src/main/resources/static/js/dashboard.js
@@ -51,10 +51,11 @@ $(document).ready(function () {
  */
 function getTimesheetByEndDate(endDate) {
  var employeeId = $('#employeeId').val();
- console.log("Inside getTimesheetByEndDate method:: endDate: " + endDate + " employeeId: " + employeeId);
+ var endDateFormatted = moment(endDate).format("MM/DD/YYYY");
+ console.log("Inside getTimesheetByEndDate method:: endDate: " + endDateFormatted + " employeeId: " + employeeId);
  $.ajax({
  type: 'GET',
- url: '/employeeManagement/api/getTimesheetByEndDate?endDate=' + endDate + "&employeeId=" + employeeId,
+ url: '/employeeManagement/api/getTimesheetByEndDate?endDate=' + endDateFormatted + "&employeeId=" + employeeId,
  success: function (responsedata) {
  console.log("Inside success function after getting the timesheet info.");
  populateViewTimesheet(responsedata);

diff --git a/src/main/resources/static/js/employeeDetailsSummary.js b/src/main/resources/static/js/employeeDetailsSummary.js
@@ -44,7 +44,7 @@ function fetchEmpDetails() {
  {
  data: 'employeeId',
  mRender: function (data, type, row) {
- var link = '<a class="btn-link" href="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/employeeManagement/employeeDetails?empId="' + data + '>View</a>';
+ var link = '<a class="btn-link" href="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/employeeManagement/employeeDetails?empId="' + data + '""> View </a>';
  return link;
  }
  }

diff --git a/src/main/webapp/WEB-INF/jsp/employee/dashboard.jsp b/src/main/webapp/WEB-INF/jsp/employee/dashboard.jsp
@@ -99,107 +99,102 @@
  <div class="jumbotron">
  <h1 class="mb-4">Employee Details</h1>
 
- <form>
- <input type="hidden" id="employeeId" value="${user.employeeId}">
- <input type="hidden" id="currentEndDate" value="${currentEndDate}">
+ <input type="hidden" id="employeeId" value="${user.employeeId}">
+ <input type="hidden" id="currentEndDate" value="${currentEndDate}">
 
- <div class="form-group row">
- <label class="col-lg-2 form-control-label">Employee Name </label>
- <div class="col-lg-4">
- <span> ${user.employeeFirstName} ${user.employeeLastName} </span>
- </div>
-
- <label class="col-lg-2 form-control-label">Employee Id </label>
- <div class="col-lg-4">
- <span> ${user.assignedEmployeeId} </span>
- </div>
+ <div class="form-group row">
+ <label class="col-lg-2 form-control-label">Employee Name </label>
+ <div class="col-lg-4">
+ <span> ${user.employeeFirstName} ${user.employeeLastName} </span>
  </div>
 
- <div class="form-group row">
-  <label class="col-lg-2 form-control-label">Email </label>
- <div class="col-lg-4">
-  <span> ${user.employeeEmailId} </span>
-  </div>
+ <label class="col-lg-2 form-control-label">Employee Id </label>
+ <div class="col-lg-4">
+ <span> ${user.assignedEmployeeId} </span>
+ </div>
+ </div>
 
-  <label class="col-lg-2 form-control-label">Phone </label>
-  <div class="col-lg-4">
-  <span> ${user.employeePhone} </span>
- </div>
+ <div class="form-group row">
+ <label class="col-lg-2 form-control-label">Email </label>
+ <div class="col-lg-4">
+ <span> ${user.employeeEmailId} </span>
  </div>
 
- </form>
+ <label class="col-lg-2 form-control-label">Phone </label>
+ <div class="col-lg-4">
+ <span> ${user.employeePhone} </span>
+ </div>
+ </div>
  </div>
 
  <div class="card mb-4" id="viewTimesheet">
  <div class="card-block">
  <h3 class="card-title mb-4">View Timesheet</h3>
 
- <form>
- <div class="form-group row">
- <label for="selectedTimePeriod" class="col-lg-2 form-control-label">
- Selected TimePeriod :
- </label>
- <div class="col-lg-2">
- <span id="selectedTimePeriod"></span>
- </div>
-
- <label class="col-lg-2 form-control-label">Status : </label>
- <div class="col-lg-2">
- <span id="timesheetStatus"></span>
- </div>
+ <div class="form-group row">
+ <label for="selectedTimePeriod" class="col-lg-2 form-control-label">
+ Selected TimePeriod :
+ </label>
+ <div class="col-lg-2">
+ <span id="selectedTimePeriod"></span>
+ </div>
+
+ <label class="col-lg-2 form-control-label">Status : </label>
+ <div class="col-lg-2">
+ <span id="timesheetStatus"></span>
+ </div>
+ </div>
+
+ <div class="form-group row">
+ <label class="col-lg-2 form-control-label">Regular
+ Hours : </label>
+ <div class="col-lg-2">
+ <span id="regularHours"></span>
+ </div>
+
+ <label class="col-lg-2 form-control-label">Extra
+ Hours : </label>
+ <div class="col-lg-2">
+ <span id="extraHours"></span>
  </div>
 
- <div class="form-group row">
- <label class="col-lg-2 form-control-label">Regular
- Hours : </label>
- <div class="col-lg-2">
- <span id="regularHours"></span>
- </div>
-
- <label class="col-lg-2 form-control-label">Extra
- Hours : </label>
- <div class="col-lg-2">
- <span id="extraHours"></span>
- </div>
-
- <label class="col-lg-2 form-control-label">Total
- Hours : </label>
- <div class="col-lg-2">
- <span id="totalHours"></span>
- </div>
+ <label class="col-lg-2 form-control-label">Total
+ Hours : </label>
+ <div class="col-lg-2">
+ <span id="totalHours"></span>
  </div>
+ </div>
 
- <div class="form-group row">
- <label class="col-lg-2 form-control-label">Submitted By : </label>
- <div class="col-lg-2">
- <span id="submitterName"></span>
- </div>
-
- <label class="col-lg-2 form-control-label">Submitted On : </label>
- <div class="col-lg-2">
- <span id="submittedDate"></span>
- </div>
-
- <label class="col-lg-2 form-control-label">Approved On : </label>
- <div class="col-lg-2">
- <span id="approvalDate"></span>
- </div>
+ <div class="form-group row">
+ <label class="col-lg-2 form-control-label">Submitted By : </label>
+ <div class="col-lg-2">
+ <span id="submitterName"></span>
  </div>
- <br>
 
- <div class="form-group row" id="uploadedTimesheet">
- <a href="" target="_blank" id="uploadTimesheetLink">
- Click here to access the uploaded timesheet:
- <span id="uploadedTimesheetName"></span>
- </a>
+ <label class="col-lg-2 form-control-label">Submitted On : </label>
+ <div class="col-lg-2">
+ <span id="submittedDate"></span>
  </div>
- <br>
- <div class="form-group">
- <label for="timesheetComments">Comments : </label>
- <textarea class="form-control col-xl-8" id="timesheetComments"
- rows="3" readonly></textarea>
+
+ <label class="col-lg-2 form-control-label">Approved On : </label>
+ <div class="col-lg-2">
+ <span id="approvalDate"></span>
  </div>
- </form>
+ </div>
+ <br>
+
+ <div class="form-group row" id="uploadedTimesheet">
+ <a href="" target="_blank" id="uploadTimesheetLink">
+ Click here to access the uploaded timesheet:
+ <span id="uploadedTimesheetName"></span>
+ </a>
+ </div>
+ <br>
+ <div class="form-group">
+ <label for="timesheetComments">Comments : </label>
+ <textarea class="form-control col-xl-8" id="timesheetComments"
+ rows="3" readonly></textarea>
+ </div>
  </div>
 
  </div>
@@ -234,7 +229,6 @@
  <th>View</th>
  </tr>
  </tfoot>
-
  </table>
  </div>
 
@@ -262,9 +256,9 @@
 <script src="./js/external/bootstrap.min.js"></script>
 <script src="./js/external/jquery.dataTables.min.js"></script>
 <script src="./js/external/dataTables.bootstrap4.min.js"></script>
+<script src="./js/external/moment.min.js"></script>
 <script src="./js/external/bootstrap-datetimepicker.min.js"></script>
 <script src="./js/external/custom.js"></script>
-<script src="./js/external/moment.min.js"></script>
 <script src="./js/dashboard.js"></script>
 </body>
 </html>
diff --git a/src/main/webapp/WEB-INF/jsp/sideNavbar.jsp b/src/main/webapp/WEB-INF/jsp/sideNavbar.jsp
@@ -17,7 +17,7 @@
  </a>
  </li>
  <li class="nav-item">
- <a class="nav-link" href="/employeeManagement/employeeDetails">
+ <a class="nav-link" href="/employeeManagement/employeeDetailsSummary">
  <em class="fa fa-bar-chart"></em> Employee Details
  </a>
  </li>

diff --git a/src/main/webapp/WEB-INF/jsp/staff/dashboard-staff.jsp b/src/main/webapp/WEB-INF/jsp/staff/dashboard-staff.jsp
@@ -207,8 +207,8 @@
  <h3 class="card-title">Timesheet Summary</h3>
  <hr>
 
- <form:form method="POST" action="dashboard"
- modelAttribute="dashboardSearch" id="dashboardForm">
+ <form:form method="POST" action="dashboard" modelAttribute="dashboardSearch"
+ id="dashboardForm">
 
  <div class="row">
  <spring:bind path="fromDate">

diff --git a/src/main/webapp/WEB-INF/jsp/staff/employeeDetails.jsp b/src/main/webapp/WEB-INF/jsp/staff/employeeDetails.jsp
@@ -31,8 +31,7 @@
  <hr>
  </div>
  <div class="col-md-12">
- <h4 class="subheading"> Welcome to Employee Management App. Please create your Account
- to continue. </h4>
+ <h4>Employee Details</h4>
  <hr>
  <c:if test="${not empty msg}">
  <div class="col-md-12">