yoganandhank
/
contract_management_system
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

changes in file showing

master
yoga-agoy 3 months ago
parent
f3ba275d41
commit
4f64c12b27
2 changed files with 132 additions and 155 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 108
      src/main/webapp/exist_bill_det_display.jsp
  2. 179
      src/main/webapp/exist_ext_bill_det_display.jsp

108
src/main/webapp/exist_bill_det_display.jsp
View File

@ -133,122 +133,118 @@ if (isExtendedFlag == 1) {
<%=String.format("%,.2f", contDetListWrapper.getContList().get(0).getContAmt())%>
</div>
</div>
<div id="fileRow"
class="row mb-3 d-flex justify-content-between text-center">
<div class="col-12 col-md-3">
<div id="fileRow" class="row mb-3 d-flex justify-content-between text-center">
<div class="col-12 col-md-3">
<p>
<strong>AS File : </strong>
<% if (!contDetListWrapper.getContList().get(0).getContASFilePath().trim().equals("-")) { %>
<button class="btn"
onclick="viewFileInModal('<%=contNum%>','AS',
'<%=java.net.URLEncoder.encode(contDetListWrapper.getContList().get(0).getContASFilePath(), "UTF-8").replace("+",
"%20")%>')">
<i class="fas fa-light fa-eye" style="cursor: pointer"></i>
</button>
<% } else if (contDetListWrapper.getContList().get(0).getContASFilePath().trim().equals("-")) { %>
<i class="fa-regular fa-circle-xmark"></i>
<% } %>
</p>
</div>
<%
if (!contDetListWrapper.getContList().get(0).getContLOAFilePath().trim().equals("-")) {
%>
<div class="col-12 col-md-3">
<p>
<strong>LOA File :</strong>
<strong>LOA File : </strong>
<% if (!contDetListWrapper.getContList().get(0).getContLOAFilePath().trim().equals("-")) { %>
<button class="btn"
onclick="viewFileInModal('<%=contNum%>','LOA',
onclick="viewFileInModal('<%=contNum%>','AS',
'<%=java.net.URLEncoder.encode(contDetListWrapper.getContList().get(0).getContLOAFilePath(), "UTF-8").replace("+",
"%20")%>')">
<i class="fas fa-light fa-eye" style="cursor: pointer"></i>
</button>
<% } else if (contDetListWrapper.getContList().get(0).getContLOAFilePath().trim().equals("-")) { %>
<i class="fa-regular fa-circle-xmark"></i>
<% } %>
</p>
</div>
<div class="col-12 col-md-3">
<p>
<strong>Agreement File :</strong>
<button class="btn"
onclick="viewFileInModal('<%=contNum%>','Agreement',
'<%=java.net.URLEncoder.encode(contDetListWrapper.getContList().get(0).getContAgreeFilePath(), "UTF-8")
.replace("+", "%20")%>')">
<i class="fas fa-light fa-eye" style="cursor: pointer"></i>
</button>
</p>
</div>
<%
} else {
%>
<div class="col-12 col-md-3">
<p>
<strong>Agreement File :</strong>
<strong>Agreement File : </strong>
<% if (!contDetListWrapper.getContList().get(0).getContAgreeFilePath().trim().equals("-")) { %>
<button class="btn"
onclick="viewFileInModal('<%=contNum%>','Agreement',
'<%=java.net.URLEncoder.encode(contDetListWrapper.getContList().get(0).getContAgreeFilePath(), "UTF-8")
.replace("+", "%20")%>')">
onclick="viewFileInModal('<%=contNum%>','AS',
'<%=java.net.URLEncoder.encode(contDetListWrapper.getContList().get(0).getContAgreeFilePath(), "UTF-8").replace("+",
"%20")%>')">
<i class="fas fa-light fa-eye" style="cursor: pointer"></i>
</button>
<% } else if (contDetListWrapper.getContList().get(0).getContAgreeFilePath().trim().equals("-")) { %>
<i class="fa-regular fa-circle-xmark"></i>
<% } %>
</p>
</div>
<%
}
%>
</div>
<div id="fileRow2"
class="row mb-3 d-flex justify-content-between text-center">
<div class="col-12 col-md-3">
<p>
<strong>WO File : </strong>
<strong>Work Order File : </strong>
<% if (!contDetListWrapper.getContList().get(0).getContWOFilePath().trim().equals("-")) { %>
<button class="btn"
onclick="viewFileInModal('<%=contNum%>','Work-Order',
onclick="viewFileInModal('<%=contNum%>','AS',
'<%=java.net.URLEncoder.encode(contDetListWrapper.getContList().get(0).getContWOFilePath(), "UTF-8").replace("+",
"%20")%>')">
<i class="fas fa-eye" style="cursor: pointer"></i>
<i class="fas fa-light fa-eye" style="cursor: pointer"></i>
</button>
<% } else if (contDetListWrapper.getContList().get(0).getContWOFilePath().trim().equals("-")) { %>
<i class="fa-regular fa-circle-xmark"></i>
<% } %>
</p>
</div>
</div>
<div id="fileRow2"
class="row mb-3 d-flex justify-content-between text-center">
<%
if (!contDetListWrapper.getContList().get(0).getContEMDFilePath().trim().equals("-")) {
%>
<div class="col-12 col-md-3">
<p>
<strong>EMD File : </strong>
<% if (!contDetListWrapper.getContList().get(0).getContEMDFilePath().trim().equals("-")) { %>
<button class="btn"
onclick="viewFileInModal('<%=contNum%>','EMD',
onclick="viewFileInModal('<%=contNum%>','AS',
'<%=java.net.URLEncoder.encode(contDetListWrapper.getContList().get(0).getContEMDFilePath(), "UTF-8").replace("+",
"%20")%>')">
<i class="fas fa-eye" style="cursor: pointer"></i>
<i class="fas fa-light fa-eye" style="cursor: pointer"></i>
</button>
<% } else if (contDetListWrapper.getContList().get(0).getContEMDFilePath().trim().equals("-")) { %>
<i class="fa-regular fa-circle-xmark"></i>
<% } %>
</p>
</div>
<%
}
if (!contDetListWrapper.getContList().get(0).getContSDFilePath().trim().equals("-")) {
%>
<div class="col-12 col-md-3">
<p>
<strong>SD File : </strong>
<% if (!contDetListWrapper.getContList().get(0).getContSDFilePath().trim().equals("-")) { %>
<button class="btn"
onclick="viewFileInModal('<%=contNum%>','SD',
onclick="viewFileInModal('<%=contNum%>','AS',
'<%=java.net.URLEncoder.encode(contDetListWrapper.getContList().get(0).getContSDFilePath(), "UTF-8").replace("+",
"%20")%>')">
<i class="fas fa-eye" style="cursor: pointer"></i>
<i class="fas fa-light fa-eye" style="cursor: pointer"></i>
</button>
<% } else if (contDetListWrapper.getContList().get(0).getContSDFilePath().trim().equals("-")) { %>
<i class="fa-regular fa-circle-xmark"></i>
<% } %>
</p>
</div>
<%
}
if (!contDetListWrapper.getContList().get(0).getContASDFilePath().trim().equals("-")) {
%>
<div class="col-12 col-md-3">
</div>
<div id="fileRow3"
class="row mb-3 d-flex justify-content-between text-center">
<div class="col-12 col-md-3">
<p>
<strong>ASD File : </strong>
<% if (!contDetListWrapper.getContList().get(0).getContASDFilePath().trim().equals("-")) { %>
<button class="btn"
onclick="viewFileInModal('<%=contNum%>','ASD',
onclick="viewFileInModal('<%=contNum%>','AS',
'<%=java.net.URLEncoder.encode(contDetListWrapper.getContList().get(0).getContASDFilePath(), "UTF-8").replace("+",
"%20")%>')">
<i class="fas fa-eye" style="cursor: pointer"></i>
<i class="fas fa-light fa-eye" style="cursor: pointer"></i>
</button>
<% } else if (contDetListWrapper.getContList().get(0).getContASDFilePath().trim().equals("-")) { %>
<i class="fa-regular fa-circle-xmark"></i>
<% } %>
</p>
</div>
<%
}
%>
</div>
<%
}

179
src/main/webapp/exist_ext_bill_det_display.jsp
View File

@ -115,107 +115,88 @@ if (reqSrc.equalsIgnoreCase("exist_cont_det_display_page")) {
</div>
</div>
<div id="fileRow" class="row mb-3 d-flex justify-content-between text-center">
<div class="col-12 col-md-3">
<p>
<strong>Ext.AS File : </strong>
<button class="btn"
onclick="viewFileInModal('<%=contNum%>','AS-Ext',
'<%=java.net.URLEncoder.encode(contDetListWrapper.getContList().get(0).getContASFilePath(),
"UTF-8").replace("+", "%20")%>')">
<i class="fas fa-light fa-eye" style="cursor: pointer"></i>
</button>
</p>
</div>
<%
if (!contDetListWrapper.getContList().get(0).getContAgreeFilePath().trim().equals("-")) {
%>
<div class="col-12 col-md-3">
<p>
<strong>Ext.Agreement File :</strong>
<button class="btn"
onclick="viewFileInModal('<%=contNum%>','Agreement-Ext',
'<%=java.net.URLEncoder.encode(contDetListWrapper.getContList().get(0).getContAgreeFilePath(),
"UTF-8").replace("+", "%20")%>')">
<i class="fas fa-light fa-eye" style="cursor: pointer"></i>
</button>
</p>
</div>
<div class="col-12 col-md-3">
<p>
<strong>Ext.WO File : </strong>
<button class="btn"
onclick="viewFileInModal('<%=contNum%>','Work-Order-Ext',
'<%=java.net.URLEncoder.encode(contDetListWrapper.getContList().get(0).getContWOFilePath(),
"UTF-8").replace("+", "%20")%>')">
<i class="fas fa-eye" style="cursor: pointer"></i>
</button>
</p>
<div class="col-12 col-md-3">
<p>
<strong>Ext.AS File : </strong>
<% if (!contDetListWrapper.getContList().get(0).getContASFilePath().trim().equals("-")) { %>
<button class="btn"
onclick="viewFileInModal('<%=contNum%>','AS',
'<%=java.net.URLEncoder.encode(contDetListWrapper.getContList().get(0).getContASFilePath(), "UTF-8").replace("+",
"%20")%>')">
<i class="fas fa-light fa-eye" style="cursor: pointer"></i>
</button>
<% } else if (contDetListWrapper.getContList().get(0).getContASFilePath().trim().equals("-")) { %>
<i class="fa-regular fa-circle-xmark"></i>
<% } %>
</p>
</div>
<div class="col-12 col-md-3">
<p>
<strong>Ext.Agreement File : </strong>
<% if (!contDetListWrapper.getContList().get(0).getContAgreeFilePath().trim().equals("-")) { %>
<button class="btn"
onclick="viewFileInModal('<%=contNum%>','AS',
'<%=java.net.URLEncoder.encode(contDetListWrapper.getContList().get(0).getContAgreeFilePath(), "UTF-8").replace("+",
"%20")%>')">
<i class="fas fa-light fa-eye" style="cursor: pointer"></i>
</button>
<% } else if (contDetListWrapper.getContList().get(0).getContAgreeFilePath().trim().equals("-")) { %>
<i class="fa-regular fa-circle-xmark"></i>
<% } %>
</p>
</div>
<div class="col-12 col-md-3">
<p>
<strong>Ext.Work Order File : </strong>
<% if (!contDetListWrapper.getContList().get(0).getContWOFilePath().trim().equals("-")) { %>
<button class="btn"
onclick="viewFileInModal('<%=contNum%>','AS',
'<%=java.net.URLEncoder.encode(contDetListWrapper.getContList().get(0).getContWOFilePath(), "UTF-8").replace("+",
"%20")%>')">
<i class="fas fa-light fa-eye" style="cursor: pointer"></i>
</button>
<% } else if (contDetListWrapper.getContList().get(0).getContWOFilePath().trim().equals("-")) { %>
<i class="fa-regular fa-circle-xmark"></i>
<% } %>
</p>
</div>
</div>
<%
} else {
%>
<div class="col-12 col-md-3">
<p>
<strong>Ext.WO File : </strong>
<button class="btn"
onclick="viewFileInModal('<%=contNum%>','Work-Order-Ext',
'<%=java.net.URLEncoder.encode(contDetListWrapper.getContList().get(0).getContWOFilePath(),
"UTF-8").replace("+", "%20")%>')">
<i class="fas fa-eye" style="cursor: pointer"></i>
</button>
</p>
<div id="fileRow2"
class="row mb-3 d-flex justify-content-between text-center">
<div class="col-12 col-md-3">
<p>
<strong>Ext.SD File : </strong>
<% if (!contDetListWrapper.getContList().get(0).getContSDFilePath().trim().equals("-")) { %>
<button class="btn"
onclick="viewFileInModal('<%=contNum%>','AS',
'<%=java.net.URLEncoder.encode(contDetListWrapper.getContList().get(0).getContSDFilePath(), "UTF-8").replace("+",
"%20")%>')">
<i class="fas fa-light fa-eye" style="cursor: pointer"></i>
</button>
<% } else if (contDetListWrapper.getContList().get(0).getContSDFilePath().trim().equals("-")) { %>
<i class="fa-regular fa-circle-xmark"></i>
<% } %>
</p>
</div>
<div class="col-12 col-md-3">
<p>
<strong>ASD File : </strong>
<% if (!contDetListWrapper.getContList().get(0).getContASDFilePath().trim().equals("-")) { %>
<button class="btn"
onclick="viewFileInModal('<%=contNum%>','AS',
'<%=java.net.URLEncoder.encode(contDetListWrapper.getContList().get(0).getContASDFilePath(), "UTF-8").replace("+",
"%20")%>')">
<i class="fas fa-light fa-eye" style="cursor: pointer"></i>
</button>
<% } else if (contDetListWrapper.getContList().get(0).getContASDFilePath().trim().equals("-")) { %>
<i class="fa-regular fa-circle-xmark"></i>
<% } %>
</p>
</div>
</div>
<%
}
%>
</div>
<div id="fileRow2" class="row mb-3 d-flex justify-content-between text-center">
<%
if (!contDetListWrapper.getContList().get(0).getContASDFilePath().trim().equals("-")) {
%>
<div class="col-12 col-md-3">
<p>
<strong>Ext.SD File : </strong>
<button class="btn"
onclick="viewFileInModal('<%=contNum%>', 'SD-Ext',
'<%=java.net.URLEncoder.encode(contDetListWrapper.getContList().get(0).getContSDFilePath(),
"UTF-8").replace("+","%20")%>')">
<i class="fas fa-eye" style="cursor: pointer"></i>
</button>
</p>
</div>
<div class="col-12 col-md-3">
<p>
<strong>Ext.ASD File : </strong>
<button class="btn"
onclick="viewFileInModal('<%=contNum%>', 'ASD-Ext',
'<%=java.net.URLEncoder.encode(contDetListWrapper.getContList().get(0).getContASDFilePath(),
"UTF-8").replace("+","%20")%>')">
<i class="fas fa-eye" style="cursor: pointer"></i>
</button>
</p>
</div>
<%
} else if (!contDetListWrapper.getContList().get(0).getContSDFilePath().trim().equals("-")){
%>
<div class="col-12 col-md-3">
<p>
<strong>Ext.SD File : </strong>
<button class="btn"
onclick="viewFileInModal('<%=contNum%>', 'SD-Ext',
'<%=java.net.URLEncoder.encode(contDetListWrapper.getContList().get(0).getContSDFilePath(),
"UTF-8").replace("+","%20")%>')">
<i class="fas fa-eye" style="cursor: pointer"></i>
</button>
</p>
</div>
<%
}
%>
</div>
<%
}
%>
<%
}
%>
<div class="row mb-3">
<div class="col-md-6">
<p>

Write Preview
Loading…
Cancel
Save