Major Commit: Updated code for pre-populating the Immigration Details…

… Summary and selected Immigration information.
mahi-mullapudi · Sep 11, 2018 · e229c61 · e229c61
1 parent 2dcf67a
commit e229c61
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 38 deletions.
diff --git a/src/main/resources/static/js/immiDetails.js b/src/main/resources/static/js/immiDetails.js
@@ -31,37 +31,27 @@ function fetchImmigrationDetails() {
  ],
  columns: [
  {
- data: 'clientName'
+ data: 'currentStatus'
  },
  {
- data: 'clientAddress'
+ data: 'receiptNumber'
  },
  {
- data: 'contractStartDate',
+ data: 'startDate',
  mRender: function (data) {
  return moment(data).format("MM/DD/YYYY");
  }
  },
  {
- data: 'contractEndDate',
+ data: 'endDate',
  mRender: function (data) {
  return moment(data).format("MM/DD/YYYY");
  }
  },
  {
- data: 'contractCompany'
- },
- {
- data: 'vendorCompany'
- },
- {
- data: 'vendorContactName'
- },
- {
- data: 'clientDetailsId',
+ data: 'immiDetailsId',
  mRender: function (data, type, row) {
- var link = '';
- link = '<button class="btn-link" onclick="getImmigrationDetailById(' + data + ', false)">View</button>';
+ var link = '<button class="btn-link" onclick="getImmigrationDetailById(' + data + ', false)">View</button>';
  return link;
  }
  }
@@ -92,28 +82,16 @@ function getImmigrationDetailById(immigrationDetailId) {
 
 /**
  * Populates the Immigration Detail Information into the View Immigration Detail fields from the returned immigrationDetailObj.
- * @param clientDetailObj
+ * @param immigrationDetailObj
  */
 function populateImmigrationDetails(immigrationDetailObj) {
  $('#viewImmigrationDetailsDiv').show();
  console.log("Inside populate Client Detail method ::");
- $('#clientDetailsId').val(clientDetailObj.clientDetailsId);
- $('#clientName').val(clientDetailObj.clientName);
- $('#clientStreet').val(clientDetailObj.clientStreet);
- $('#clientCity').val(clientDetailObj.clientCity);
- $('#clientState').val(clientDetailObj.clientState);
- $('#clientZip').val(clientDetailObj.clientZip);
- $('#contractCompany').val(clientDetailObj.contractCompany);
- $('#vendorCompany').val(clientDetailObj.vendorCompany);
- $('#contractStartDate').val(moment(clientDetailObj.contractStartDate).format("MM/DD/YYYY"));
- $('#contractEndDate').val(moment(clientDetailObj.contractEndDate).format("MM/DD/YYYY"));
- $('#vendorContactName').val(clientDetailObj.vendorContactName);
- $('#vendorPhone').val(clientDetailObj.vendorPhone);
- $('#vendorEmail').val(clientDetailObj.vendorEmail);
- $('#paymentTerms').val(clientDetailObj.paymentTerms);
- $('#invoiceContactName').val(clientDetailObj.invoiceContactName);
- $('#invoiceContactPhone').val(clientDetailObj.invoiceContactPhone);
- $('#invoiceContactEmail').val(clientDetailObj.invoiceContactEmail);
- $('#invoiceFrequency').val(clientDetailObj.invoiceFrequency);
- $('#comments').val(clientDetailObj.comments);
+ $('#immiDetailsId').val(immigrationDetailObj.immiDetailsId);
+ $('#currentStatus').val(immigrationDetailObj.currentStatus);
+ $('#receiptNumber').val(immigrationDetailObj.receiptNumber);
+ $('#lcaNumber').val(immigrationDetailObj.lcaNumber);
+ $('#currentWage').val(immigrationDetailObj.currentWage);
+ $('#startDate').val(moment(immigrationDetailObj.startDate).format("MM/DD/YYYY"));
+ $('#endDate').val(moment(immigrationDetailObj.endDate).format("MM/DD/YYYY"));
 }
diff --git a/src/main/webapp/WEB-INF/jsp/staff/immigrationDetails.jsp b/src/main/webapp/WEB-INF/jsp/staff/immigrationDetails.jsp
@@ -121,7 +121,9 @@
  <form:form method="POST" modelAttribute="immigrationDetails"
  action="${immiActionUrl}">
 
- <form:hidden path="immiDetailsId"/>
+ <form:hidden id="immiDetailsId" path="immiDetailsId"/>
+ <input type="hidden" id="employeeId" name="employee.employeeId"
+ value="${empId}">
  <div class="row">
 
  <spring:bind path="currentStatus">
@@ -252,7 +254,6 @@
  <th>Immigration Status</th>
  <th>Start Date</th>
  <th>End Date</th>
- <th>Comments</th>
  <th>View</th>
  </tr>
  </thead>