Skip to content

Can't save or print rourke2020 form #623

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yingbull merged 2 commits into from
Sep 24, 2025
Merged

Can't save or print rourke2020 form #623

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
edc6b5a
Fixed possible null ref issues with if conditionals in the Frm2Action…
LiamStanziani Sep 22, 2025
4b808d7
Fixed null rourke submit types due to old styleId on forms in 2009, 2…
LiamStanziani Sep 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions dependencies-lock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1333,11 +1333,11 @@
}, {
"groupId" : "net.java.dev.jna",
"artifactId" : "jna",
"version" : "5.17.0",
"version" : "5.18.0",
"scope" : "compile",
"type" : "jar",
"optional" : false,
"integrity" : "sha512:M/NSUo/HCgf/yRhP+AZHsCxR6ibOsRznDupK29lBmm+BG8EXRtxz3fQP8qIdrtvqq9NJ6QHzDsXoQaH1/G8bUg=="
"integrity" : "sha512:FQsMRq9urazfh8ZNyrEJ+sWotSJG6nARKnQlCkgDeAdVdyFCnIFBPE4DgTQcT2Wmvi83/HBlEzJ9ok1ukmPNTg=="
}, {
"groupId" : "net.sf.ezmorph",
"artifactId" : "ezmorph",
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/ca/openosp/openo/form/Frm2Action.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ public String execute() {
newID = formId;
}
//if we are printing all pages of form, grab info from db and merge with current page info
else if (request.getParameter("submit").equals("printAll") || request.getParameter("submit").equals("printAllJasperReport")) {
Comment thread
sourcery-ai[bot] marked this conversation as resolved.
else if ("printAll".equals(request.getParameter("submit")) || "printAllJasperReport".equals(request.getParameter("submit"))) {

if (rec instanceof JasperReportPdfPrint) {
boolean isRourkeForm2020 = true;
Expand Down Expand Up @@ -146,7 +146,7 @@ else if (request.getParameter("submit").equals("printAll") || request.getParamet
}
newID = formId;
}
} else if (request.getParameter("update") != null && request.getParameter("update").equals("true")) {
} else if ("true".equals(request.getParameter("update"))) {
boolean bMulPage = request.getParameter("c_lastVisited") != null;
String name;

Expand Down Expand Up @@ -180,10 +180,10 @@ else if (request.getParameter("submit").equals("printAll") || request.getParamet
newID = rec.saveFormRecord(props);
LogAction.addLog((String) request.getSession().getAttribute("user"), LogConst.UPDATE, request
.getParameter("form_class"), "" + newID, request.getRemoteAddr(), request.getParameter("demographic_no"));
} else if (request.getParameter("submit").equals("autosaveAjax")) {
} else if ("autosaveAjax".equals(request.getParameter("submit"))) {
quickSaveForm(rec, request, response);
return null;
} else if (request.getParameter("submit").equals("saveFormLetter")) {
} else if ("saveFormLetter".equals(request.getParameter("submit"))) {
for (Enumeration varEnum = request.getParameterNames(); varEnum.hasMoreElements(); ) {
String name = (String) varEnum.nextElement();
props.setProperty(name, request.getParameter(name));
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/form/formrourke2009complete.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -736,7 +736,7 @@
</script>
</head>
<body onload="init()">
<form styleId="frmP1" action="${pageContext.request.contextPath}/form/formname.do" method="post">
<form id="frmP1" name="frmP1" action="${pageContext.request.contextPath}/form/formname.do" method="post">
<table>
<tr>
<td id="cp1">
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/form/formrourke2017complete.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -709,7 +709,7 @@
</head>
<body onload="init()">

<form styleId="frmP1" action="${pageContext.request.contextPath}/form/formname.do" method="post">
<form id="frmP1" name="frmP1" action="${pageContext.request.contextPath}/form/formname.do" method="post">
<div id="rourke2017-tabs">
<ul id="tab-list">
<li><a href="#tab-cp1">Page I</a></li>
Expand Down
3 changes: 1 addition & 2 deletions src/main/webapp/form/formrourke2020complete.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,6 @@
}

function onPrintAll() {

document.forms["frmP1"].action = "<%= request.getContextPath() %>/form/formname.do?__title=Rourke+Baby+Report&__cfgfile=Rourke2020printCfgPg1&__cfgfile=Rourke2020printCfgPg2&__cfgfile=Rourke2020printCfgPg3&__cfgfile=Rourke2020printCfgPg4&__template=Rourke2020";
document.forms["frmP1"].action += "&submit=printAllJasperReport";
document.forms["frmP1"].target = "_blank";
Expand Down Expand Up @@ -737,7 +736,7 @@
</style>
</head>
<body onload="init()">
<form styleId="frmP1" action="${pageContext.request.contextPath}/form/formname.do" method="post">
<form id="frmP1" name="frmP1" action="${pageContext.request.contextPath}/form/formname.do" method="post">
<div id="rourke2020-tabs">
<ul id="tab-list">
<li><a href="#tab-cp1">Page I</a></li>
Expand Down
Loading