Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp
===================================================================
diff -u -r36099 -r38908
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp (.../packingView.jsp) (revision 36099)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp (.../packingView.jsp) (revision 38908)
@@ -56,6 +56,9 @@
request.setAttribute("supplyRoomCoding", supplyRoomCoding);
request.setAttribute("supplyRoomName", supplyRoomName);
request.setAttribute("TEMPLATE_NAME_PREFIX",LabelTemplate.TEMPLATE_NAME_PREFIX);
+
+ SimpleDateFormat nowDateFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm");
+ request.setAttribute("nowToday", nowDateFormat.format(new Date()));
%>
@@ -387,6 +390,7 @@
var TYPE_SUPPLIER = encodeURIComponent('<%=Supplier.SUPPLIER_TYPE_RENTTOUSSE%>');
var toussePriceFluctuation = '<%=request.getAttribute("toussePriceFluctuation")%>';
var today = '<%=request.getAttribute("today")%>';
+var nowToday = '<%=request.getAttribute("nowToday")%>';
var userName = '<%=request.getAttribute("userName")%>';
var hospitalName = '<%=request.getAttribute("hospitalName")%>';
var foreignDefaultLabelpaper = '<%=request.getAttribute("foreignDefaultLabelpaper")%>';
Index: ssts-web/src/main/webapp/disinfectsystem/interfere/interfereForeignTousseApplicationView.jsp
===================================================================
diff -u -r35540 -r38908
--- ssts-web/src/main/webapp/disinfectsystem/interfere/interfereForeignTousseApplicationView.jsp (.../interfereForeignTousseApplicationView.jsp) (revision 35540)
+++ ssts-web/src/main/webapp/disinfectsystem/interfere/interfereForeignTousseApplicationView.jsp (.../interfereForeignTousseApplicationView.jsp) (revision 38908)
@@ -5,12 +5,16 @@
<%@page import="com.forgon.disinfectsystem.entity.basedatamanager.videomanager.VideoFile" %>
<%@page import="com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition"%>
<%@page import="com.forgon.disinfectsystem.entity.foreigntousseapplication.ForeignTousseApplication"%>
+<%@page import="java.util.Date"%>
+<%@page import="java.text.SimpleDateFormat"%>
<%
LoginUserData loginUser = AcegiHelper.getLoginUser();
request.setAttribute("userName",loginUser.getUserFullName());
request.setAttribute("userLoginName",loginUser.getUserName());
request.setAttribute("depart",AcegiHelper.getLoginUser().getCurrentOrgUnitName());
request.setAttribute("departCoding",AcegiHelper.getLoginUser().getOrgUnitCodingFromSupplyRoomConfig());
+ SimpleDateFormat nowDateFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm");
+ request.setAttribute("nowToday", nowDateFormat.format(new Date()));
%>
@@ -41,6 +45,7 @@
SSTS_ShowUrgentLevelAndUrgentAmount = true;
+ var nowToday = '<%=request.getAttribute("nowToday")%>';
Index: ssts-web/src/main/webapp/disinfectsystem/packing/historyPackingView.jsp
===================================================================
diff -u -r37469 -r38908
--- ssts-web/src/main/webapp/disinfectsystem/packing/historyPackingView.jsp (.../historyPackingView.jsp) (revision 37469)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/historyPackingView.jsp (.../historyPackingView.jsp) (revision 38908)
@@ -57,6 +57,8 @@
String supplyRoomName = supplyRoomConfigManager.getFirstSupplyRoomConfig().getOrgUnitName();
request.setAttribute("supplyRoomCoding", supplyRoomCoding);
request.setAttribute("supplyRoomName", supplyRoomName);
+ SimpleDateFormat nowDateFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm");
+ request.setAttribute("nowToday", nowDateFormat.format(new Date()));
%>