MSHR-99: Resolved First Faustin's validation faults set

rwanda-rbc-emr · Apr 18, 2016 · b91dd3b · b91dd3b
1 parent 73b9b1c
commit b91dd3b
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 12 deletions.
diff --git a/omod/src/main/webapp/followupChild.jsp b/omod/src/main/webapp/followupChild.jsp
@@ -1,5 +1,5 @@
 <%@ include file="template/localIncludes.jsp"%>
-<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%>
+<%@ taglib prefix="springform" uri="/WEB-INF/taglibs/spring-form.tld" %>
 
 <!-- *************************************** -->
 
@@ -61,7 +61,7 @@
 
 <br/> -->
 
-<form:form commandName="pmtctChildTest"
+<springform:form commandName="pmtctChildTest"
 	action="childTestForm.form?patientId=${patient.patientId}&encounterType=${param.encounterType}"
 	method="post">
 
@@ -262,7 +262,7 @@
 		<div style="clear:both;"></div>
 	</div>
 
-</form:form>
+</springform:form>
 
 <script type="text/javascript">
 

diff --git a/omod/src/main/webapp/pmtctAddCPNInfoForm.jsp b/omod/src/main/webapp/pmtctAddCPNInfoForm.jsp
@@ -1,5 +1,6 @@
 <%@ include file="template/localIncludes.jsp"%>
-<%@taglib prefix="form" uri="http://www.springframework.org/tags/form"%>
+<%@ taglib prefix="springform" uri="/WEB-INF/taglibs/spring-form.tld" %>
+
 
 <!-- *************************************** -->
 
@@ -54,7 +55,7 @@
 
 </div>
 
-<form:form commandName="pmtctCPNInfo" action="addCPNInfoForm.form?patientId=${patient.patientId}"
+<springform:form commandName="pmtctCPNInfo" action="addCPNInfoForm.form?patientId=${patient.patientId}"
 	method="post">
 
 	<div id="requiredInfos" style="display: none;">
@@ -390,7 +391,7 @@
 
 	</div>
 
-</form:form>
+</springform:form>
 
 <div id="divDlg"></div>
 

diff --git a/omod/src/main/webapp/pmtctMaternityForm.jsp b/omod/src/main/webapp/pmtctMaternityForm.jsp
@@ -1,5 +1,4 @@
 <%@ include file="template/localIncludes.jsp"%>
-<%@taglib prefix="form" uri="http://www.springframework.org/tags/form"%>
 <!-- ************************************************************* -->
 
 <openmrs:require privilege="Add Maternity information" otherwise="/login.htm" redirect="/module/@MODULE_ID@/addMaternityForm.form" />

diff --git a/omod/src/main/webapp/template/localIncludes.jsp b/omod/src/main/webapp/template/localIncludes.jsp
@@ -14,12 +14,7 @@
 <%@ taglib prefix="pmtct_tag" tagdir="/WEB-INF/tags/module/pmtct"%>
 
 <!-- Jquery includes -->
-<openmrs:htmlInclude file="/moduleResources/@MODULE_ID@/scripts/jquery-1.3.2.js" />
 <openmrs:htmlInclude file="/moduleResources/@MODULE_ID@/scripts/jquery.bgiframe.js" />
-<openmrs:htmlInclude file="/moduleResources/@MODULE_ID@/scripts/ui/ui.core.js" />
-<openmrs:htmlInclude file="/moduleResources/@MODULE_ID@/scripts/ui/ui.dialog.js" />
-<openmrs:htmlInclude file="/moduleResources/@MODULE_ID@/scripts/ui/ui.draggable.js" />
-<openmrs:htmlInclude file="/moduleResources/@MODULE_ID@/scripts/ui/ui.resizable.js" />
 
 <openmrs:htmlInclude file="/moduleResources/@MODULE_ID@/theme/ui.all.css" />
 <!-- <openmrs:htmlInclude file="/moduleResources/@MODULE_ID@/theme/demos.css" /> -->