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
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 102
      src/main/webapp/exist_bill_det_display.jsp
  2. 105
      src/main/webapp/exist_ext_bill_det_display.jsp

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

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

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

Write Preview
Loading…
Cancel
Save