You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ar...@apache.org on 2016/11/02 19:09:18 UTC
svn commit: r1767764 [25/33] - in /ofbiz/trunk:
applications/accounting/groovyScripts/admin/
applications/accounting/groovyScripts/ap/invoices/
applications/accounting/groovyScripts/ar/
applications/accounting/groovyScripts/chartofaccounts/ application...
Modified: ofbiz/trunk/framework/webtools/groovyScripts/service/ScheduleJob.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/groovyScripts/service/ScheduleJob.groovy?rev=1767764&r1=1767763&r2=1767764&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/groovyScripts/service/ScheduleJob.groovy (original)
+++ ofbiz/trunk/framework/webtools/groovyScripts/service/ScheduleJob.groovy Wed Nov 2 19:09:13 2016
@@ -17,64 +17,64 @@
* under the License.
*/
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.sql.Timestamp;
-
-import org.apache.ofbiz.base.util.Debug;
-import org.apache.ofbiz.base.util.UtilMisc;
-import org.apache.ofbiz.base.util.UtilValidate;
-import org.apache.ofbiz.service.DispatchContext;
-import org.apache.ofbiz.service.ModelService;
-import org.apache.ofbiz.service.ModelParam;
-import org.apache.ofbiz.service.RunningService;
-import org.apache.ofbiz.service.engine.GenericEngine;
-import org.apache.ofbiz.service.config.ServiceConfigUtil;
+import java.util.ArrayList
+import java.util.HashMap
+import java.util.Iterator
+import java.util.List
+import java.util.Map
+import java.sql.Timestamp
+
+import org.apache.ofbiz.base.util.Debug
+import org.apache.ofbiz.base.util.UtilMisc
+import org.apache.ofbiz.base.util.UtilValidate
+import org.apache.ofbiz.service.DispatchContext
+import org.apache.ofbiz.service.ModelService
+import org.apache.ofbiz.service.ModelParam
+import org.apache.ofbiz.service.RunningService
+import org.apache.ofbiz.service.engine.GenericEngine
+import org.apache.ofbiz.service.config.ServiceConfigUtil
-savedSyncResult = null;
+savedSyncResult = null
if (session.getAttribute("_SAVED_SYNC_RESULT_") != null) {
- savedSyncResult = session.getAttribute("_SAVED_SYNC_RESULT_");
+ savedSyncResult = session.getAttribute("_SAVED_SYNC_RESULT_")
}
-serviceName = parameters.SERVICE_NAME;
-context.POOL_NAME = ServiceConfigUtil.getServiceEngine().getThreadPool().getSendToPool();
+serviceName = parameters.SERVICE_NAME
+context.POOL_NAME = ServiceConfigUtil.getServiceEngine().getThreadPool().getSendToPool()
-scheduleOptions = [];
-serviceParameters = [];
-e = request.getParameterNames();
+scheduleOptions = []
+serviceParameters = []
+e = request.getParameterNames()
while (e.hasMoreElements()) {
- paramName = e.nextElement();
- paramValue = parameters[paramName];
- scheduleOptions.add([name : paramName, value : paramValue]);
+ paramName = e.nextElement()
+ paramValue = parameters[paramName]
+ scheduleOptions.add([name : paramName, value : paramValue])
}
-context.scheduleOptions = scheduleOptions;
+context.scheduleOptions = scheduleOptions
if (serviceName) {
- dctx = dispatcher.getDispatchContext();
- model = null;
+ dctx = dispatcher.getDispatchContext()
+ model = null
try {
- model = dctx.getModelService(serviceName);
+ model = dctx.getModelService(serviceName)
} catch (Exception exc) {
- context.errorMessageList = [exc.getMessage()];
+ context.errorMessageList = [exc.getMessage()]
}
if (model != null) {
model.getInParamNames().each { paramName ->
- par = model.getParam(paramName);
+ par = model.getParam(paramName)
if (par.internal) {
- return;
+ return
}
- serviceParam = null;
+ serviceParam = null
if (savedSyncResult?.get(par.name)) {
- serviceParam = [name : par.name, type : par.type, optional : par.optional ? "Y" : "N", defaultValue : par.defaultValue, value : savedSyncResult.get(par.name)];
+ serviceParam = [name : par.name, type : par.type, optional : par.optional ? "Y" : "N", defaultValue : par.defaultValue, value : savedSyncResult.get(par.name)]
} else {
- serviceParam = [name : par.name, type : par.type, optional : par.optional ? "Y" : "N", defaultValue : par.defaultValue];
+ serviceParam = [name : par.name, type : par.type, optional : par.optional ? "Y" : "N", defaultValue : par.defaultValue]
}
- serviceParameters.add(serviceParam);
+ serviceParameters.add(serviceParam)
}
}
}
-context.serviceParameters = serviceParameters;
+context.serviceParameters = serviceParameters
Modified: ofbiz/trunk/framework/webtools/groovyScripts/service/ServiceResult.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/groovyScripts/service/ServiceResult.groovy?rev=1767764&r1=1767763&r2=1767764&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/groovyScripts/service/ServiceResult.groovy (original)
+++ ofbiz/trunk/framework/webtools/groovyScripts/service/ServiceResult.groovy Wed Nov 2 19:09:13 2016
@@ -17,42 +17,42 @@
* under the License.
*/
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.Map;
-import java.util.Set;
-import java.sql.Timestamp;
-
-import org.apache.ofbiz.entity.GenericEntity;
-import org.apache.ofbiz.base.util.UtilMisc;
-import org.apache.ofbiz.base.util.Debug;
-import org.apache.ofbiz.webapp.event.CoreEvents;
+import java.util.HashMap
+import java.util.Iterator
+import java.util.LinkedList
+import java.util.Map
+import java.util.Set
+import java.sql.Timestamp
+
+import org.apache.ofbiz.entity.GenericEntity
+import org.apache.ofbiz.base.util.UtilMisc
+import org.apache.ofbiz.base.util.Debug
+import org.apache.ofbiz.webapp.event.CoreEvents
if (session.getAttribute("_RUN_SYNC_RESULT_")) {
- serviceResultList = [];
- serviceResult = session.getAttribute("_RUN_SYNC_RESULT_");
+ serviceResultList = []
+ serviceResult = session.getAttribute("_RUN_SYNC_RESULT_")
if (parameters.servicePath) {
- servicePath = parameters.servicePath;
- newServiceResult = CoreEvents.getObjectFromServicePath(servicePath, serviceResult);
+ servicePath = parameters.servicePath
+ newServiceResult = CoreEvents.getObjectFromServicePath(servicePath, serviceResult)
if (newServiceResult && newServiceResult instanceof Map) {
- serviceResult = newServiceResult;
+ serviceResult = newServiceResult
}
- context.servicePath = servicePath;
+ context.servicePath = servicePath
}
serviceResult.each { key, value ->
- valueMap = [key : key, value : value.toString()];
+ valueMap = [key : key, value : value.toString()]
if (value instanceof Map || value instanceof Collection) {
- valueMap.hasChild = "Y";
+ valueMap.hasChild = "Y"
} else {
- valueMap.hasChild = "N";
+ valueMap.hasChild = "N"
}
- serviceResultList.add(valueMap);
+ serviceResultList.add(valueMap)
}
- context.serviceResultList = serviceResultList;
+ context.serviceResultList = serviceResultList
}
Modified: ofbiz/trunk/framework/webtools/groovyScripts/service/Services.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/groovyScripts/service/Services.groovy?rev=1767764&r1=1767763&r2=1767764&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/groovyScripts/service/Services.groovy (original)
+++ ofbiz/trunk/framework/webtools/groovyScripts/service/Services.groovy Wed Nov 2 19:09:13 2016
@@ -17,37 +17,37 @@
* under the License.
*/
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.sql.Timestamp;
+import java.util.ArrayList
+import java.util.HashMap
+import java.util.Iterator
+import java.util.Map
+import java.sql.Timestamp
-import org.apache.ofbiz.base.util.UtilMisc;
-import org.apache.ofbiz.service.ServiceDispatcher;
-import org.apache.ofbiz.service.RunningService;
-import org.apache.ofbiz.service.engine.GenericEngine;
-import org.apache.ofbiz.base.util.UtilHttp;
-import org.apache.ofbiz.base.util.UtilProperties;
+import org.apache.ofbiz.base.util.UtilMisc
+import org.apache.ofbiz.service.ServiceDispatcher
+import org.apache.ofbiz.service.RunningService
+import org.apache.ofbiz.service.engine.GenericEngine
+import org.apache.ofbiz.base.util.UtilHttp
+import org.apache.ofbiz.base.util.UtilProperties
-uiLabelMap = UtilProperties.getResourceBundleMap("WebtoolsUiLabels", locale);
-uiLabelMap.addBottomResourceBundle("CommonUiLabels");
+uiLabelMap = UtilProperties.getResourceBundleMap("WebtoolsUiLabels", locale)
+uiLabelMap.addBottomResourceBundle("CommonUiLabels")
-log = ServiceDispatcher.getServiceLogMap();
-serviceList = [];
+log = ServiceDispatcher.getServiceLogMap()
+serviceList = []
log.each { rs, value ->
- service = [:];
- service.serviceName = rs.getModelService().name;
- service.localName = rs.getLocalName();
- service.startTime = rs.getStartStamp();
- service.endTime = rs.getEndStamp();
- service.modeStr = rs.getMode() == GenericEngine.SYNC_MODE ? uiLabelMap.WebtoolsSync : uiLabelMap.WebtoolsAsync;
+ service = [:]
+ service.serviceName = rs.getModelService().name
+ service.localName = rs.getLocalName()
+ service.startTime = rs.getStartStamp()
+ service.endTime = rs.getEndStamp()
+ service.modeStr = rs.getMode() == GenericEngine.SYNC_MODE ? uiLabelMap.WebtoolsSync : uiLabelMap.WebtoolsAsync
- serviceList.add(service);
+ serviceList.add(service)
}
-sortField = parameters.sortField;
+sortField = parameters.sortField
if (sortField) {
- context.services = UtilMisc.sortMaps(serviceList, UtilMisc.toList(sortField));
+ context.services = UtilMisc.sortMaps(serviceList, UtilMisc.toList(sortField))
} else {
- context.services = serviceList;
+ context.services = serviceList
}
Modified: ofbiz/trunk/framework/webtools/groovyScripts/service/Threads.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/groovyScripts/service/Threads.groovy?rev=1767764&r1=1767763&r2=1767764&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/groovyScripts/service/Threads.groovy (original)
+++ ofbiz/trunk/framework/webtools/groovyScripts/service/Threads.groovy Wed Nov 2 19:09:13 2016
@@ -17,37 +17,37 @@
* under the License.
*/
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.sql.Timestamp;
-
-import org.apache.ofbiz.base.util.UtilMisc;
-import org.apache.ofbiz.service.RunningService;
-import org.apache.ofbiz.service.engine.GenericEngine;
-import org.apache.ofbiz.base.util.UtilHttp;
-import org.apache.ofbiz.base.util.UtilProperties;
-
-uiLabelMap = UtilProperties.getResourceBundleMap("WebtoolsUiLabels", locale);
-uiLabelMap.addBottomResourceBundle("CommonUiLabels");
-
-threads = [];
-poolState = dispatcher.getJobManager().getPoolState();
-context.poolState = poolState;
-context.threads = poolState.taskList;
+import java.util.ArrayList
+import java.util.HashMap
+import java.util.Iterator
+import java.util.List
+import java.util.Map
+import java.sql.Timestamp
+
+import org.apache.ofbiz.base.util.UtilMisc
+import org.apache.ofbiz.service.RunningService
+import org.apache.ofbiz.service.engine.GenericEngine
+import org.apache.ofbiz.base.util.UtilHttp
+import org.apache.ofbiz.base.util.UtilProperties
+
+uiLabelMap = UtilProperties.getResourceBundleMap("WebtoolsUiLabels", locale)
+uiLabelMap.addBottomResourceBundle("CommonUiLabels")
+
+threads = []
+poolState = dispatcher.getJobManager().getPoolState()
+context.poolState = poolState
+context.threads = poolState.taskList
// Some stuff for general threads on the server
-currentThread = Thread.currentThread();
-currentThreadGroup = currentThread.getThreadGroup();
-topThreadGroup = currentThreadGroup;
+currentThread = Thread.currentThread()
+currentThreadGroup = currentThread.getThreadGroup()
+topThreadGroup = currentThreadGroup
while (topThreadGroup.getParent()) {
- topThreadGroup = topThreadGroup.getParent();
+ topThreadGroup = topThreadGroup.getParent()
}
-Thread[] allThreadArray = new Thread[1000];
-topThreadGroup.enumerate(allThreadArray);
-allThreadList = Arrays.asList(allThreadArray);
+Thread[] allThreadArray = new Thread[1000]
+topThreadGroup.enumerate(allThreadArray)
+allThreadList = Arrays.asList(allThreadArray)
-context.allThreadList = allThreadList;
+context.allThreadList = allThreadList
Modified: ofbiz/trunk/framework/webtools/groovyScripts/stats/StatBinsHistory.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/groovyScripts/stats/StatBinsHistory.groovy?rev=1767764&r1=1767763&r2=1767764&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/groovyScripts/stats/StatBinsHistory.groovy (original)
+++ ofbiz/trunk/framework/webtools/groovyScripts/stats/StatBinsHistory.groovy Wed Nov 2 19:09:13 2016
@@ -17,43 +17,43 @@
* under the License.
*/
-import org.apache.ofbiz.base.util.*;
-import org.apache.ofbiz.security.Security;
-import org.apache.ofbiz.webapp.stats.*;
+import org.apache.ofbiz.base.util.*
+import org.apache.ofbiz.security.Security
+import org.apache.ofbiz.webapp.stats.*
-id = parameters.statsId;
-typeStr = parameters.type;
-type = -1;
+id = parameters.statsId
+typeStr = parameters.type
+type = -1
try {
- type = Integer.valueOf(typeStr);
+ type = Integer.valueOf(typeStr)
} catch (NumberFormatException e) {}
-binList = null;
+binList = null
if (type == ServerHitBin.REQUEST) {
- binList = ServerHitBin.requestHistory.get(id);
+ binList = ServerHitBin.requestHistory.get(id)
} else if (type == ServerHitBin.EVENT) {
- binList = ServerHitBin.eventHistory.get(id);
+ binList = ServerHitBin.eventHistory.get(id)
} else if (type == ServerHitBin.VIEW) {
- binList = ServerHitBin.viewHistory.get(id);
+ binList = ServerHitBin.viewHistory.get(id)
}
if (binList) {
- requestList = [];
+ requestList = []
binList.each { bin ->
- requestIdMap = [:];
+ requestIdMap = [:]
if (bin != null) {
- requestIdMap.requestId = bin.getId();
- requestIdMap.requestType = bin.getType();
- requestIdMap.startTime = bin.getStartTimeString();
- requestIdMap.endTime = bin.getEndTimeString();
- requestIdMap.lengthMins = UtilFormatOut.formatQuantity(bin.getBinLengthMinutes());
- requestIdMap.numberHits = UtilFormatOut.formatQuantity(bin.getNumberHits());
- requestIdMap.minTime = UtilFormatOut.formatQuantity(bin.getMinTimeSeconds());
- requestIdMap.avgTime = UtilFormatOut.formatQuantity(bin.getAvgTimeSeconds());
- requestIdMap.maxTime = UtilFormatOut.formatQuantity(bin.getMaxTimeSeconds());
- requestIdMap.hitsPerMin = UtilFormatOut.formatQuantity(bin.getHitsPerMinute());
- requestList.add(requestIdMap);
+ requestIdMap.requestId = bin.getId()
+ requestIdMap.requestType = bin.getType()
+ requestIdMap.startTime = bin.getStartTimeString()
+ requestIdMap.endTime = bin.getEndTimeString()
+ requestIdMap.lengthMins = UtilFormatOut.formatQuantity(bin.getBinLengthMinutes())
+ requestIdMap.numberHits = UtilFormatOut.formatQuantity(bin.getNumberHits())
+ requestIdMap.minTime = UtilFormatOut.formatQuantity(bin.getMinTimeSeconds())
+ requestIdMap.avgTime = UtilFormatOut.formatQuantity(bin.getAvgTimeSeconds())
+ requestIdMap.maxTime = UtilFormatOut.formatQuantity(bin.getMaxTimeSeconds())
+ requestIdMap.hitsPerMin = UtilFormatOut.formatQuantity(bin.getHitsPerMinute())
+ requestList.add(requestIdMap)
}
}
- context.requestList = requestList;
+ context.requestList = requestList
}
Modified: ofbiz/trunk/framework/webtools/groovyScripts/stats/StatsSinceStart.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/groovyScripts/stats/StatsSinceStart.groovy?rev=1767764&r1=1767763&r2=1767764&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/groovyScripts/stats/StatsSinceStart.groovy (original)
+++ ofbiz/trunk/framework/webtools/groovyScripts/stats/StatsSinceStart.groovy Wed Nov 2 19:09:13 2016
@@ -17,85 +17,85 @@
* under the License.
*/
-import org.apache.ofbiz.base.util.UtilFormatOut;
-import org.apache.ofbiz.base.util.UtilMisc;
-import org.apache.ofbiz.base.util.UtilValidate;
-import org.apache.ofbiz.security.Security;
-import org.apache.ofbiz.webapp.stats.*;
+import org.apache.ofbiz.base.util.UtilFormatOut
+import org.apache.ofbiz.base.util.UtilMisc
+import org.apache.ofbiz.base.util.UtilValidate
+import org.apache.ofbiz.security.Security
+import org.apache.ofbiz.webapp.stats.*
-clearBins = parameters.clear;
+clearBins = parameters.clear
if ("true".equals(clearBins)) {
- ServerHitBin.requestSinceStarted.clear();
- ServerHitBin.eventSinceStarted.clear();
- ServerHitBin.viewSinceStarted.clear();
+ ServerHitBin.requestSinceStarted.clear()
+ ServerHitBin.eventSinceStarted.clear()
+ ServerHitBin.viewSinceStarted.clear()
}
// Requests
-iterator = UtilMisc.toIterator(new TreeSet(ServerHitBin.requestSinceStarted.keySet()));
-requestList = [];
+iterator = UtilMisc.toIterator(new TreeSet(ServerHitBin.requestSinceStarted.keySet()))
+requestList = []
while (iterator.hasNext()) {
- requestIdMap = [:];
- statsId = iterator.next();
- bin = ServerHitBin.requestSinceStarted.get(statsId);
+ requestIdMap = [:]
+ statsId = iterator.next()
+ bin = ServerHitBin.requestSinceStarted.get(statsId)
if (bin) {
- requestIdMap.requestId = bin.getId();
- requestIdMap.requestType = bin.getType();
- requestIdMap.startTime = bin.getStartTimeString();
- requestIdMap.endTime = bin.getEndTimeString();
- requestIdMap.lengthMins = UtilFormatOut.formatQuantity(bin.getBinLengthMinutes());
- requestIdMap.numberHits = UtilFormatOut.formatQuantity(bin.getNumberHits());
- requestIdMap.minTime = UtilFormatOut.formatQuantity(bin.getMinTimeSeconds());
- requestIdMap.avgTime = UtilFormatOut.formatQuantity(bin.getAvgTimeSeconds());
- requestIdMap.maxTime = UtilFormatOut.formatQuantity(bin.getMaxTimeSeconds());
- requestIdMap.hitsPerMin = UtilFormatOut.formatQuantity(bin.getHitsPerMinute());
- requestList.add(requestIdMap);
+ requestIdMap.requestId = bin.getId()
+ requestIdMap.requestType = bin.getType()
+ requestIdMap.startTime = bin.getStartTimeString()
+ requestIdMap.endTime = bin.getEndTimeString()
+ requestIdMap.lengthMins = UtilFormatOut.formatQuantity(bin.getBinLengthMinutes())
+ requestIdMap.numberHits = UtilFormatOut.formatQuantity(bin.getNumberHits())
+ requestIdMap.minTime = UtilFormatOut.formatQuantity(bin.getMinTimeSeconds())
+ requestIdMap.avgTime = UtilFormatOut.formatQuantity(bin.getAvgTimeSeconds())
+ requestIdMap.maxTime = UtilFormatOut.formatQuantity(bin.getMaxTimeSeconds())
+ requestIdMap.hitsPerMin = UtilFormatOut.formatQuantity(bin.getHitsPerMinute())
+ requestList.add(requestIdMap)
}
}
-context.requestList = requestList;
+context.requestList = requestList
// Events
-iterator = UtilMisc.toIterator(new TreeSet(ServerHitBin.eventSinceStarted.keySet()));
-eventList = [];
+iterator = UtilMisc.toIterator(new TreeSet(ServerHitBin.eventSinceStarted.keySet()))
+eventList = []
while (iterator.hasNext()) {
- requestIdMap = [:];
- statsId = iterator.next();
- bin = ServerHitBin.eventSinceStarted.get(statsId);
+ requestIdMap = [:]
+ statsId = iterator.next()
+ bin = ServerHitBin.eventSinceStarted.get(statsId)
if (bin) {
- requestIdMap.requestId = bin.getId();
- requestIdMap.requestType = bin.getType();
- requestIdMap.startTime = bin.getStartTimeString();
- requestIdMap.endTime = bin.getEndTimeString();
- requestIdMap.lengthMins = UtilFormatOut.formatQuantity(bin.getBinLengthMinutes());
- requestIdMap.numberHits = UtilFormatOut.formatQuantity(bin.getNumberHits());
- requestIdMap.minTime = UtilFormatOut.formatQuantity(bin.getMinTimeSeconds());
- requestIdMap.avgTime = UtilFormatOut.formatQuantity(bin.getAvgTimeSeconds());
- requestIdMap.maxTime = UtilFormatOut.formatQuantity(bin.getMaxTimeSeconds());
- requestIdMap.hitsPerMin = UtilFormatOut.formatQuantity(bin.getHitsPerMinute());
- eventList.add(requestIdMap);
+ requestIdMap.requestId = bin.getId()
+ requestIdMap.requestType = bin.getType()
+ requestIdMap.startTime = bin.getStartTimeString()
+ requestIdMap.endTime = bin.getEndTimeString()
+ requestIdMap.lengthMins = UtilFormatOut.formatQuantity(bin.getBinLengthMinutes())
+ requestIdMap.numberHits = UtilFormatOut.formatQuantity(bin.getNumberHits())
+ requestIdMap.minTime = UtilFormatOut.formatQuantity(bin.getMinTimeSeconds())
+ requestIdMap.avgTime = UtilFormatOut.formatQuantity(bin.getAvgTimeSeconds())
+ requestIdMap.maxTime = UtilFormatOut.formatQuantity(bin.getMaxTimeSeconds())
+ requestIdMap.hitsPerMin = UtilFormatOut.formatQuantity(bin.getHitsPerMinute())
+ eventList.add(requestIdMap)
}
}
-context.eventList = eventList;
+context.eventList = eventList
// Views
-iterator = UtilMisc.toIterator(new TreeSet(ServerHitBin.viewSinceStarted.keySet()));
-viewList = [];
+iterator = UtilMisc.toIterator(new TreeSet(ServerHitBin.viewSinceStarted.keySet()))
+viewList = []
while (iterator.hasNext()) {
- requestIdMap = [:];
- statsId = iterator.next();
- bin = ServerHitBin.viewSinceStarted.get(statsId);
+ requestIdMap = [:]
+ statsId = iterator.next()
+ bin = ServerHitBin.viewSinceStarted.get(statsId)
if (bin) {
- requestIdMap.requestId = bin.getId();
- requestIdMap.requestType = bin.getType();
- requestIdMap.startTime = bin.getStartTimeString();
- requestIdMap.endTime = bin.getEndTimeString();
- requestIdMap.lengthMins = UtilFormatOut.formatQuantity(bin.getBinLengthMinutes());
- requestIdMap.numberHits = UtilFormatOut.formatQuantity(bin.getNumberHits());
- requestIdMap.minTime = UtilFormatOut.formatQuantity(bin.getMinTimeSeconds());
- requestIdMap.avgTime = UtilFormatOut.formatQuantity(bin.getAvgTimeSeconds());
- requestIdMap.maxTime = UtilFormatOut.formatQuantity(bin.getMaxTimeSeconds());
- requestIdMap.hitsPerMin = UtilFormatOut.formatQuantity(bin.getHitsPerMinute());
- viewList.add(requestIdMap);
+ requestIdMap.requestId = bin.getId()
+ requestIdMap.requestType = bin.getType()
+ requestIdMap.startTime = bin.getStartTimeString()
+ requestIdMap.endTime = bin.getEndTimeString()
+ requestIdMap.lengthMins = UtilFormatOut.formatQuantity(bin.getBinLengthMinutes())
+ requestIdMap.numberHits = UtilFormatOut.formatQuantity(bin.getNumberHits())
+ requestIdMap.minTime = UtilFormatOut.formatQuantity(bin.getMinTimeSeconds())
+ requestIdMap.avgTime = UtilFormatOut.formatQuantity(bin.getAvgTimeSeconds())
+ requestIdMap.maxTime = UtilFormatOut.formatQuantity(bin.getMaxTimeSeconds())
+ requestIdMap.hitsPerMin = UtilFormatOut.formatQuantity(bin.getHitsPerMinute())
+ viewList.add(requestIdMap)
}
}
-context.viewList = viewList;
+context.viewList = viewList
Modified: ofbiz/trunk/specialpurpose/assetmaint/groovyScripts/assetmaint/EditMaint.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/groovyScripts/assetmaint/EditMaint.groovy?rev=1767764&r1=1767763&r2=1767764&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/groovyScripts/assetmaint/EditMaint.groovy (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/groovyScripts/assetmaint/EditMaint.groovy Wed Nov 2 19:09:13 2016
@@ -21,13 +21,13 @@
// screen is called from one of the WorkEffort calendar screens.
// The URL coming from WorkEffort does not contain the maintHistSeqId parameter,
// so this script will look it up using the workEffortId parameter.
-maintHistSeqId = parameters.maintHistSeqId;
-workEffortId = parameters.workEffortId;
+maintHistSeqId = parameters.maintHistSeqId
+workEffortId = parameters.workEffortId
if (!maintHistSeqId && workEffortId) {
- fixedAssetMaint = from("FixedAssetMaint").where("scheduleWorkEffortId", workEffortId).queryFirst();
+ fixedAssetMaint = from("FixedAssetMaint").where("scheduleWorkEffortId", workEffortId).queryFirst()
if (fixedAssetMaint) {
- parameters.fixedAssetId = fixedAssetMaint.fixedAssetId;
- parameters.maintHistSeqId = fixedAssetMaint.maintHistSeqId;
+ parameters.fixedAssetId = fixedAssetMaint.fixedAssetId
+ parameters.maintHistSeqId = fixedAssetMaint.maintHistSeqId
}
}
Modified: ofbiz/trunk/specialpurpose/assetmaint/groovyScripts/assetmaint/PrintFixedAssetMaint.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/groovyScripts/assetmaint/PrintFixedAssetMaint.groovy?rev=1767764&r1=1767763&r2=1767764&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/groovyScripts/assetmaint/PrintFixedAssetMaint.groovy (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/groovyScripts/assetmaint/PrintFixedAssetMaint.groovy Wed Nov 2 19:09:13 2016
@@ -17,52 +17,52 @@ specific language governing permissions
under the License.
**/
-facility = fixedAsset.getRelatedOne("LocatedAtFacility", false);
-context.locatedAtFacility = facility;
+facility = fixedAsset.getRelatedOne("LocatedAtFacility", false)
+context.locatedAtFacility = facility
-fixedAssetIdents = from("FixedAssetIdent").where("fixedAssetId", fixedAssetId).queryList();
-fixedAssetIdentValue = "";
+fixedAssetIdents = from("FixedAssetIdent").where("fixedAssetId", fixedAssetId).queryList()
+fixedAssetIdentValue = ""
if (fixedAssetIdents) {
fixedAssetIdents.each { ident ->
- fixedAssetIdentValue = fixedAssetIdentValue + " " + ident.idValue;
+ fixedAssetIdentValue = fixedAssetIdentValue + " " + ident.idValue
}
}
-context.fixedAssetIdentValue = fixedAssetIdentValue;
+context.fixedAssetIdentValue = fixedAssetIdentValue
-status = fixedAssetMaint.getRelatedOne("StatusItem", false);
+status = fixedAssetMaint.getRelatedOne("StatusItem", false)
if (status) {
- context.statusItemDesc = status.description;
+ context.statusItemDesc = status.description
}
-//context.put("fixedAssetMaint",fixedAssetMaint);
+//context.put("fixedAssetMaint",fixedAssetMaint)
-intervalUom = fixedAssetMaint.getRelatedOne("IntervalUom", false);
+intervalUom = fixedAssetMaint.getRelatedOne("IntervalUom", false)
if (intervalUom) {
- context.intervalUomDesc = intervalUom.description;
+ context.intervalUomDesc = intervalUom.description
}
-instanceOfProductId = fixedAsset.instanceOfProductId;
-productMaintSeqId = fixedAssetMaint.productMaintSeqId;
+instanceOfProductId = fixedAsset.instanceOfProductId
+productMaintSeqId = fixedAssetMaint.productMaintSeqId
if (productMaintSeqId) {
- productMaint = from("ProductMaint").where("productId", instanceOfProductId, "productMaintSeqId", productMaintSeqId).queryOne();
- context.productMaintName = productMaint.maintName;
+ productMaint = from("ProductMaint").where("productId", instanceOfProductId, "productMaintSeqId", productMaintSeqId).queryOne()
+ context.productMaintName = productMaint.maintName
}
-productMaintTypeId = fixedAssetMaint.productMaintTypeId;
+productMaintTypeId = fixedAssetMaint.productMaintTypeId
if (productMaintTypeId) {
- productMaintType = from("ProductMaintType").where("productMaintTypeId", productMaintTypeId).queryOne();
+ productMaintType = from("ProductMaintType").where("productMaintTypeId", productMaintTypeId).queryOne()
if (productMaintType) {
- productMaintTypeDesc = productMaintType.description;
- context.productMaintTypeDesc = productMaintTypeDesc;
+ productMaintTypeDesc = productMaintType.description
+ context.productMaintTypeDesc = productMaintTypeDesc
}
}
-intervalMeterTypeId = fixedAssetMaint.intervalMeterTypeId;
-productMeterTypeDesc = "";
+intervalMeterTypeId = fixedAssetMaint.intervalMeterTypeId
+productMeterTypeDesc = ""
if (intervalMeterTypeId) {
- productMeterType = from("ProductMeterType").where("productMeterTypeId", intervalMeterTypeId).queryOne();
- productMeterTypeDesc = productMeterType.description;
+ productMeterType = from("ProductMeterType").where("productMeterTypeId", intervalMeterTypeId).queryOne()
+ productMeterTypeDesc = productMeterType.description
}
-context.productMeterTypeDesc = productMeterTypeDesc;
+context.productMeterTypeDesc = productMeterTypeDesc
-scheduleWorkEffort = fixedAssetMaint.getRelatedOne("ScheduleWorkEffort", false);
-context.scheduleWorkEffort = scheduleWorkEffort;
+scheduleWorkEffort = fixedAssetMaint.getRelatedOne("ScheduleWorkEffort", false)
+context.scheduleWorkEffort = scheduleWorkEffort
Modified: ofbiz/trunk/specialpurpose/assetmaint/groovyScripts/workeffort/EditWorkEfforts.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/groovyScripts/workeffort/EditWorkEfforts.groovy?rev=1767764&r1=1767763&r2=1767764&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/groovyScripts/workeffort/EditWorkEfforts.groovy (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/groovyScripts/workeffort/EditWorkEfforts.groovy Wed Nov 2 19:09:13 2016
@@ -17,61 +17,61 @@
under the License.
*/
-maintHistSeqId = context.maintHistSeqId;
-fixedAssetId = context.fixedAssetId;
-workEffortId = context.workEffortId;
+maintHistSeqId = context.maintHistSeqId
+fixedAssetId = context.fixedAssetId
+workEffortId = context.workEffortId
if (!maintHistSeqId) {
- maintHistSeqId = parameters.maintHistSeqId;
+ maintHistSeqId = parameters.maintHistSeqId
}
if (!fixedAssetId) {
- fixedAssetId = parameters.fixedAssetId;
+ fixedAssetId = parameters.fixedAssetId
}
if (!workEffortId) {
- workEffortId = parameters.workEffortId;
+ workEffortId = parameters.workEffortId
}
-fixedAssetMaint = null;
-workEffort = null;
-fixedAsset = null;
-rootWorkEffortId = null;
+fixedAssetMaint = null
+workEffort = null
+fixedAsset = null
+rootWorkEffortId = null
if (workEffortId) {
- workEffort = from("WorkEffort").where("workEffortId", workEffortId).queryOne();
+ workEffort = from("WorkEffort").where("workEffortId", workEffortId).queryOne()
if (workEffort) {
if (!fixedAssetId) {
- fixedAssetId = workEffort.fixedAssetId;
+ fixedAssetId = workEffort.fixedAssetId
}
// If this is a child workeffort, locate the "root" workeffort
- parentWorkEffort = from("WorkEffortAssoc").where("workEffortIdTo", workEffortId).queryFirst();
+ parentWorkEffort = from("WorkEffortAssoc").where("workEffortIdTo", workEffortId).queryFirst()
while (parentWorkEffort) {
- rootWorkEffortId = parentWorkEffort.workEffortIdFrom;
- parentWorkEffort = from("WorkEffortAssoc").where("workEffortIdTo", rootWorkEffortId).queryFirst();
+ rootWorkEffortId = parentWorkEffort.workEffortIdFrom
+ parentWorkEffort = from("WorkEffortAssoc").where("workEffortIdTo", rootWorkEffortId).queryFirst()
}
}
}
if (!rootWorkEffortId) {
- rootWorkEffortId = workEffortId;
+ rootWorkEffortId = workEffortId
}
if (rootWorkEffortId) {
- fixedAssetMaint = from("FixedAssetMaint").where("scheduleWorkEffortId", rootWorkEffortId).queryFirst();
+ fixedAssetMaint = from("FixedAssetMaint").where("scheduleWorkEffortId", rootWorkEffortId).queryFirst()
if (fixedAssetMaint) {
- maintHistSeqId = fixedAssetMaint.maintHistSeqId;
+ maintHistSeqId = fixedAssetMaint.maintHistSeqId
if (!fixedAssetId) {
- fixedAssetId = fixedAssetMaint.fixedAssetId;
+ fixedAssetId = fixedAssetMaint.fixedAssetId
}
}
}
if (fixedAssetId) {
- fixedAsset = from("FixedAsset").where("fixedAssetId", fixedAssetId).queryOne();
+ fixedAsset = from("FixedAsset").where("fixedAssetId", fixedAssetId).queryOne()
}
-context.fixedAssetMaint = fixedAssetMaint;
-context.workEffort = workEffort;
-context.fixedAsset = fixedAsset;
-context.maintHistSeqId = maintHistSeqId;
-context.fixedAssetId = fixedAssetId;
-context.workEffortId = workEffortId;
+context.fixedAssetMaint = fixedAssetMaint
+context.workEffort = workEffort
+context.fixedAsset = fixedAsset
+context.maintHistSeqId = maintHistSeqId
+context.fixedAssetId = fixedAssetId
+context.workEffortId = workEffortId
Modified: ofbiz/trunk/specialpurpose/bi/groovyScripts/GetStarSchemaFields.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/bi/groovyScripts/GetStarSchemaFields.groovy?rev=1767764&r1=1767763&r2=1767764&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/bi/groovyScripts/GetStarSchemaFields.groovy (original)
+++ ofbiz/trunk/specialpurpose/bi/groovyScripts/GetStarSchemaFields.groovy Wed Nov 2 19:09:13 2016
@@ -17,30 +17,30 @@
* under the License.
*/
-starSchemaName = parameters.starSchemaName;
+starSchemaName = parameters.starSchemaName
-starSchemaFields = [];
+starSchemaFields = []
if (starSchemaName) {
- reader = delegator.getModelReader();
- starSchema = reader.getModelEntity(starSchemaName);
+ reader = delegator.getModelReader()
+ starSchema = reader.getModelEntity(starSchemaName)
if (starSchema) {
- fieldsIt = starSchema.getAliasesIterator();
+ fieldsIt = starSchema.getAliasesIterator()
while (fieldsIt.hasNext()) {
- field = fieldsIt.next();
- fieldMap = [:];
- fieldMap.name = field.getName();
- description = field.getDescription();
+ field = fieldsIt.next()
+ fieldMap = [:]
+ fieldMap.name = field.getName()
+ description = field.getDescription()
if (!description) {
- aliasedEntity = starSchema.getAliasedEntity(field.getEntityAlias(), reader);
+ aliasedEntity = starSchema.getAliasedEntity(field.getEntityAlias(), reader)
if (aliasedEntity) {
- aliasedField = starSchema.getAliasedField(aliasedEntity, field.getField(), reader);
- description = aliasedField.getDescription();
+ aliasedField = starSchema.getAliasedField(aliasedEntity, field.getField(), reader)
+ description = aliasedField.getDescription()
}
}
- fieldMap.description = description;
- starSchemaFields.add(fieldMap);
+ fieldMap.description = description
+ starSchemaFields.add(fieldMap)
}
}
}
-context.starSchemaName = starSchemaName;
-context.starSchemaFields = starSchemaFields;
+context.starSchemaName = starSchemaName
+context.starSchemaFields = starSchemaFields
Modified: ofbiz/trunk/specialpurpose/bi/groovyScripts/GetStarSchemas.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/bi/groovyScripts/GetStarSchemas.groovy?rev=1767764&r1=1767763&r2=1767764&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/bi/groovyScripts/GetStarSchemas.groovy (original)
+++ ofbiz/trunk/specialpurpose/bi/groovyScripts/GetStarSchemas.groovy Wed Nov 2 19:09:13 2016
@@ -17,24 +17,24 @@
* under the License.
*/
-reader = delegator.getModelReader();
-ec = reader.getEntityNames();
-entities = new TreeSet(ec);
-entitiesIt = entities.iterator();
+reader = delegator.getModelReader()
+ec = reader.getEntityNames()
+entities = new TreeSet(ec)
+entitiesIt = entities.iterator()
-List starSchemas = [];
+List starSchemas = []
while (entitiesIt.hasNext()) {
- entity = reader.getModelEntity(entitiesIt.next());
- packageName = entity.getPackageName();
+ entity = reader.getModelEntity(entitiesIt.next())
+ packageName = entity.getPackageName()
if (!packageName.contains("starschema")) {
- continue;
+ continue
}
- entityMap = [:];
- entityMap.name = entity.getEntityName();
- entityMap.title = entity.getTitle();
+ entityMap = [:]
+ entityMap.name = entity.getEntityName()
+ entityMap.title = entity.getTitle()
- starSchemas.add(entityMap);
+ starSchemas.add(entityMap)
}
-context.starSchemas = starSchemas;
+context.starSchemas = starSchemas
Modified: ofbiz/trunk/specialpurpose/bi/groovyScripts/RunStarSchemaQuery.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/bi/groovyScripts/RunStarSchemaQuery.groovy?rev=1767764&r1=1767763&r2=1767764&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/bi/groovyScripts/RunStarSchemaQuery.groovy (original)
+++ ofbiz/trunk/specialpurpose/bi/groovyScripts/RunStarSchemaQuery.groovy Wed Nov 2 19:09:13 2016
@@ -17,17 +17,17 @@
* under the License.
*/
-import org.apache.ofbiz.base.util.UtilHttp;
+import org.apache.ofbiz.base.util.UtilHttp
-starSchemaName = parameters.starSchemaName;
-selectedFieldList = UtilHttp.parseMultiFormData(parameters);
+starSchemaName = parameters.starSchemaName
+selectedFieldList = UtilHttp.parseMultiFormData(parameters)
-columnNames = [] as Set;
+columnNames = [] as Set
selectedFieldList.each { selectedField ->
- columnNames.add(selectedField.selectedFieldName);
+ columnNames.add(selectedField.selectedFieldName)
}
-context.columnNames = columnNames;
-List records = [];
-records = select(context.columnNames).from(starSchemaName).distinct(false).queryList();
+context.columnNames = columnNames
+List records = []
+records = select(context.columnNames).from(starSchemaName).distinct(false).queryList()
-context.records = records;
+context.records = records
Modified: ofbiz/trunk/specialpurpose/birt/groovyScripts/accounting/AcctgTransEntriesSearchResultsParameters.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/groovyScripts/accounting/AcctgTransEntriesSearchResultsParameters.groovy?rev=1767764&r1=1767763&r2=1767764&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/birt/groovyScripts/accounting/AcctgTransEntriesSearchResultsParameters.groovy (original)
+++ ofbiz/trunk/specialpurpose/birt/groovyScripts/accounting/AcctgTransEntriesSearchResultsParameters.groovy Wed Nov 2 19:09:13 2016
@@ -17,32 +17,32 @@
* under the License.
*/
-def module = "AcctgTransEntriesSearchResultsParameters.groovy";
+def module = "AcctgTransEntriesSearchResultsParameters.groovy"
try {
- def birtParameters = [:];
- birtParameters.organizationPartyId = parameters.organizationPartyId;
- birtParameters.productId = parameters.productId;
- birtParameters.isPosted = parameters.isPosted;
- birtParameters.invoiceId = parameters.invoiceId;
- birtParameters.acctgTransId = parameters.acctgTransId;
- birtParameters.glFiscalTypeId = parameters.glFiscalTypeId;
- birtParameters.glAccountId = parameters.glAccountId;
- birtParameters.shipmentId = parameters.shipmentId;
- birtParameters.acctgTransTypeId = parameters.acctgTransTypeId;
- birtParameters.workEffortId = parameters.workEffortId;
- birtParameters.glJournalId = parameters.glJournalId;
- birtParameters.partyId = parameters.partyId;
- birtParameters.paymentId = parameters.paymentId;
+ def birtParameters = [:]
+ birtParameters.organizationPartyId = parameters.organizationPartyId
+ birtParameters.productId = parameters.productId
+ birtParameters.isPosted = parameters.isPosted
+ birtParameters.invoiceId = parameters.invoiceId
+ birtParameters.acctgTransId = parameters.acctgTransId
+ birtParameters.glFiscalTypeId = parameters.glFiscalTypeId
+ birtParameters.glAccountId = parameters.glAccountId
+ birtParameters.shipmentId = parameters.shipmentId
+ birtParameters.acctgTransTypeId = parameters.acctgTransTypeId
+ birtParameters.workEffortId = parameters.workEffortId
+ birtParameters.glJournalId = parameters.glJournalId
+ birtParameters.partyId = parameters.partyId
+ birtParameters.paymentId = parameters.paymentId
if (parameters.fromDate) {
- birtParameters.fromDate = Timestamp.valueOf(parameters.fromDate);
+ birtParameters.fromDate = Timestamp.valueOf(parameters.fromDate)
}
if (parameters.thruDate) {
- birtParameters.thruDate = Timestamp.valueOf(parameters.thruDate);
+ birtParameters.thruDate = Timestamp.valueOf(parameters.thruDate)
}
- birtParameters.userLoginId = userLogin.userLoginId;
- request.setAttribute("birtParameters", birtParameters);
+ birtParameters.userLoginId = userLogin.userLoginId
+ request.setAttribute("birtParameters", birtParameters)
} catch (e) {
- Debug.logError(e, module);
+ Debug.logError(e, module)
}
return "success";
\ No newline at end of file
Modified: ofbiz/trunk/specialpurpose/birt/groovyScripts/accounting/BalanceSheetParameters.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/groovyScripts/accounting/BalanceSheetParameters.groovy?rev=1767764&r1=1767763&r2=1767764&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/birt/groovyScripts/accounting/BalanceSheetParameters.groovy (original)
+++ ofbiz/trunk/specialpurpose/birt/groovyScripts/accounting/BalanceSheetParameters.groovy Wed Nov 2 19:09:13 2016
@@ -17,25 +17,25 @@
* under the License.
*/
-import java.sql.Timestamp;
-import org.apache.ofbiz.base.util.Debug;
+import java.sql.Timestamp
+import org.apache.ofbiz.base.util.Debug
-def module = "BalanceSheetParameters.groovy";
+def module = "BalanceSheetParameters.groovy"
try {
- def birtParameters = [:];
+ def birtParameters = [:]
if (parameters.fromDate) {
- birtParameters.fromDate = Timestamp.valueOf(parameters.fromDate);
+ birtParameters.fromDate = Timestamp.valueOf(parameters.fromDate)
}
if (parameters.thruDate) {
- birtParameters.thruDate = Timestamp.valueOf(parameters.thruDate);
+ birtParameters.thruDate = Timestamp.valueOf(parameters.thruDate)
}
- birtParameters.glFiscalTypeId = parameters.glFiscalTypeId;
- birtParameters.organizationPartyId = parameters.organizationPartyId;
- birtParameters.userLoginId = userLogin.userLoginId;
- birtParameters.locale = locale;
- request.setAttribute("birtParameters", birtParameters);
+ birtParameters.glFiscalTypeId = parameters.glFiscalTypeId
+ birtParameters.organizationPartyId = parameters.organizationPartyId
+ birtParameters.userLoginId = userLogin.userLoginId
+ birtParameters.locale = locale
+ request.setAttribute("birtParameters", birtParameters)
} catch (e) {
- Debug.logError(e, module);
+ Debug.logError(e, module)
}
return "success";
\ No newline at end of file
Modified: ofbiz/trunk/specialpurpose/birt/groovyScripts/accounting/IncomeStatementParameters.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/groovyScripts/accounting/IncomeStatementParameters.groovy?rev=1767764&r1=1767763&r2=1767764&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/birt/groovyScripts/accounting/IncomeStatementParameters.groovy (original)
+++ ofbiz/trunk/specialpurpose/birt/groovyScripts/accounting/IncomeStatementParameters.groovy Wed Nov 2 19:09:13 2016
@@ -17,24 +17,24 @@
* under the License.
*/
-import java.sql.Timestamp;
-import org.apache.ofbiz.base.util.Debug;
+import java.sql.Timestamp
+import org.apache.ofbiz.base.util.Debug
-def module = "IncomeStatementParameters.groovy";
+def module = "IncomeStatementParameters.groovy"
try {
- def birtParameters = [:];
+ def birtParameters = [:]
if (parameters.fromDate) {
- birtParameters.fromDate = Timestamp.valueOf(parameters.fromDate);
+ birtParameters.fromDate = Timestamp.valueOf(parameters.fromDate)
}
if (parameters.thruDate) {
- birtParameters.thruDate = Timestamp.valueOf(parameters.thruDate);
+ birtParameters.thruDate = Timestamp.valueOf(parameters.thruDate)
}
- birtParameters.glFiscalTypeId = parameters.glFiscalTypeId;
- birtParameters.organizationPartyId = parameters.organizationPartyId;
- birtParameters.userLoginId = userLogin.userLoginId;
- request.setAttribute("birtParameters", birtParameters);
+ birtParameters.glFiscalTypeId = parameters.glFiscalTypeId
+ birtParameters.organizationPartyId = parameters.organizationPartyId
+ birtParameters.userLoginId = userLogin.userLoginId
+ request.setAttribute("birtParameters", birtParameters)
} catch (e) {
- Debug.logError(e, module);
+ Debug.logError(e, module)
}
return "success";
\ No newline at end of file
Modified: ofbiz/trunk/specialpurpose/birt/groovyScripts/accounting/InvoiceAcctgTransEntryParameters.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/groovyScripts/accounting/InvoiceAcctgTransEntryParameters.groovy?rev=1767764&r1=1767763&r2=1767764&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/birt/groovyScripts/accounting/InvoiceAcctgTransEntryParameters.groovy (original)
+++ ofbiz/trunk/specialpurpose/birt/groovyScripts/accounting/InvoiceAcctgTransEntryParameters.groovy Wed Nov 2 19:09:13 2016
@@ -17,14 +17,14 @@
* under the License.
*/
-def module = "InvoiceAcctgTransEntryParameters.groovy";
+def module = "InvoiceAcctgTransEntryParameters.groovy"
try {
- birtParameters = [:];
- birtParameters.invoiceId = parameters.invoiceId;
- birtParameters.userLoginId = userLogin.userLoginId;
- request.setAttribute("birtParameters", birtParameters);
+ birtParameters = [:]
+ birtParameters.invoiceId = parameters.invoiceId
+ birtParameters.userLoginId = userLogin.userLoginId
+ request.setAttribute("birtParameters", birtParameters)
} catch (e) {
- Debug.logError(e, module);
+ Debug.logError(e, module)
}
return "success";
\ No newline at end of file
Modified: ofbiz/trunk/specialpurpose/birt/groovyScripts/accounting/PaymentAcctgTransEntryParameters.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/groovyScripts/accounting/PaymentAcctgTransEntryParameters.groovy?rev=1767764&r1=1767763&r2=1767764&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/birt/groovyScripts/accounting/PaymentAcctgTransEntryParameters.groovy (original)
+++ ofbiz/trunk/specialpurpose/birt/groovyScripts/accounting/PaymentAcctgTransEntryParameters.groovy Wed Nov 2 19:09:13 2016
@@ -17,14 +17,14 @@
* under the License.
*/
-def module = "PaymentAcctgTransEntryParameters.groovy";
+def module = "PaymentAcctgTransEntryParameters.groovy"
try {
- birtParameters = [:];
- birtParameters.paymentId = parameters.paymentId;
- birtParameters.userLoginId = userLogin.userLoginId;
- request.setAttribute("birtParameters", birtParameters);
+ birtParameters = [:]
+ birtParameters.paymentId = parameters.paymentId
+ birtParameters.userLoginId = userLogin.userLoginId
+ request.setAttribute("birtParameters", birtParameters)
} catch (e) {
- Debug.logError(e, module);
+ Debug.logError(e, module)
}
return "success";
\ No newline at end of file
Modified: ofbiz/trunk/specialpurpose/birt/groovyScripts/accounting/PaymentReport.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/groovyScripts/accounting/PaymentReport.groovy?rev=1767764&r1=1767763&r2=1767764&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/birt/groovyScripts/accounting/PaymentReport.groovy (original)
+++ ofbiz/trunk/specialpurpose/birt/groovyScripts/accounting/PaymentReport.groovy Wed Nov 2 19:09:13 2016
@@ -17,23 +17,23 @@
* under the License.
*/
-birtParameters = [:];
-birtParameters.partyIdTo = request.getParameter("partyIdTo");
-birtParameters.paymentId = request.getParameter("paymentId");
-birtParameters.paymentTypeId = request.getParameter("paymentTypeId");
-birtParameters.paymentId_op = request.getParameter("paymentId_op");
-birtParameters.paymentRefNum_ic = request.getParameter("paymentRefNum_ic");
-birtParameters.noConditionFind = request.getParameter("noConditionFind");
-birtParameters.contentType = request.getParameter("contentType");
-birtParameters.partyIdFrom = request.getParameter("partyIdFrom");
-birtParameters.paymentRefNum_op = request.getParameter("paymentRefNum_op");
-birtParameters.amount = request.getParameter("amount");
-birtParameters.statusId = request.getParameter("statusId");
-birtParameters.paymentGatewayResponseId = request.getParameter("paymentGatewayResponseId");
-birtParameters.paymentId_ic = request.getParameter("paymentId_ic");
-birtParameters.paymentRefNum = request.getParameter("paymentRefNum");
-birtParameters.comments_ic = request.getParameter("comments_ic");
-birtParameters.comments_op = request.getParameter("comments_op");
-birtParameters.comments = request.getParameter("comments");
-request.setAttribute("birtParameters", birtParameters);
-return "success";
+birtParameters = [:]
+birtParameters.partyIdTo = request.getParameter("partyIdTo")
+birtParameters.paymentId = request.getParameter("paymentId")
+birtParameters.paymentTypeId = request.getParameter("paymentTypeId")
+birtParameters.paymentId_op = request.getParameter("paymentId_op")
+birtParameters.paymentRefNum_ic = request.getParameter("paymentRefNum_ic")
+birtParameters.noConditionFind = request.getParameter("noConditionFind")
+birtParameters.contentType = request.getParameter("contentType")
+birtParameters.partyIdFrom = request.getParameter("partyIdFrom")
+birtParameters.paymentRefNum_op = request.getParameter("paymentRefNum_op")
+birtParameters.amount = request.getParameter("amount")
+birtParameters.statusId = request.getParameter("statusId")
+birtParameters.paymentGatewayResponseId = request.getParameter("paymentGatewayResponseId")
+birtParameters.paymentId_ic = request.getParameter("paymentId_ic")
+birtParameters.paymentRefNum = request.getParameter("paymentRefNum")
+birtParameters.comments_ic = request.getParameter("comments_ic")
+birtParameters.comments_op = request.getParameter("comments_op")
+birtParameters.comments = request.getParameter("comments")
+request.setAttribute("birtParameters", birtParameters)
+return "success"
Modified: ofbiz/trunk/specialpurpose/birt/groovyScripts/accounting/TrialBalanceParameters.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/groovyScripts/accounting/TrialBalanceParameters.groovy?rev=1767764&r1=1767763&r2=1767764&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/birt/groovyScripts/accounting/TrialBalanceParameters.groovy (original)
+++ ofbiz/trunk/specialpurpose/birt/groovyScripts/accounting/TrialBalanceParameters.groovy Wed Nov 2 19:09:13 2016
@@ -17,15 +17,15 @@
* under the License.
*/
-def module = "TrialBalanceParameters.groovy";
+def module = "TrialBalanceParameters.groovy"
try {
- def birtParameters = [:];
- birtParameters.organizationPartyId = parameters.organizationPartyId;
- birtParameters.customTimePeriodId = parameters.customTimePeriodId;
- birtParameters.userLoginId = userLogin.userLoginId;
- request.setAttribute("birtParameters", birtParameters);
+ def birtParameters = [:]
+ birtParameters.organizationPartyId = parameters.organizationPartyId
+ birtParameters.customTimePeriodId = parameters.customTimePeriodId
+ birtParameters.userLoginId = userLogin.userLoginId
+ request.setAttribute("birtParameters", birtParameters)
} catch (e) {
- Debug.logError(e, module);
+ Debug.logError(e, module)
}
return "success";
\ No newline at end of file
Modified: ofbiz/trunk/specialpurpose/birt/groovyScripts/facility/InventoryItemReport.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/groovyScripts/facility/InventoryItemReport.groovy?rev=1767764&r1=1767763&r2=1767764&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/birt/groovyScripts/facility/InventoryItemReport.groovy (original)
+++ ofbiz/trunk/specialpurpose/birt/groovyScripts/facility/InventoryItemReport.groovy Wed Nov 2 19:09:13 2016
@@ -17,33 +17,33 @@
* under the License.
*/
- import org.apache.ofbiz.base.util.UtilDateTime;
+ import org.apache.ofbiz.base.util.UtilDateTime
- birtParameters = [:];
+ birtParameters = [:]
/*
- birtParameters.facilityId = request.getParameter("facilityId");
- birtParameters.productId = request.getParameter("productId");
- birtParameters.productTypeId = request.getParameter("productTypeId");
- birtParameters.searchInProductCategoryId = request.getParameter("searchInProductCategoryId");
- birtParameters.contentType = request.getParameter("contentType");
- birtParameters.productSupplierId = request.getParameter("productSupplierId");
- birtParameters.statusId = request.getParameter("statusId");
- birtParameters.productsSoldThruTimestamp = request.getParameter("productsSoldThruTimestamp");
- birtParameters.VIEW_SIZE = request.getParameter("VIEW_SIZE");
- birtParameters.monthsInPastLimit = request.getParameter("monthsInPastLimit");
- birtParameters.fromDateSellThrough = request.getParameter("fromDateSellThrough");
- birtParameters.thruDateSellThrough = request.getParameter("thruDateSellThrough");
+ birtParameters.facilityId = request.getParameter("facilityId")
+ birtParameters.productId = request.getParameter("productId")
+ birtParameters.productTypeId = request.getParameter("productTypeId")
+ birtParameters.searchInProductCategoryId = request.getParameter("searchInProductCategoryId")
+ birtParameters.contentType = request.getParameter("contentType")
+ birtParameters.productSupplierId = request.getParameter("productSupplierId")
+ birtParameters.statusId = request.getParameter("statusId")
+ birtParameters.productsSoldThruTimestamp = request.getParameter("productsSoldThruTimestamp")
+ birtParameters.VIEW_SIZE = request.getParameter("VIEW_SIZE")
+ birtParameters.monthsInPastLimit = request.getParameter("monthsInPastLimit")
+ birtParameters.fromDateSellThrough = request.getParameter("fromDateSellThrough")
+ birtParameters.thruDateSellThrough = request.getParameter("thruDateSellThrough")
*/
- int lastIntMonth = Integer.parseInt(request.getParameter("lastIntMonth"));
+ int lastIntMonth = Integer.parseInt(request.getParameter("lastIntMonth"))
if (lastIntMonth == 0 ){
- fromOrderDate = null;
+ fromOrderDate = null
}else{
- fromDateTime = UtilDateTime.getDayStart(UtilDateTime.toTimestamp(UtilDateTime.nowTimestamp()), (lastIntMonth*(-30)));
+ fromDateTime = UtilDateTime.getDayStart(UtilDateTime.toTimestamp(UtilDateTime.nowTimestamp()), (lastIntMonth*(-30)))
fromOrderDate = UtilDateTime.toDateString(fromDateTime,"MMMM dd, yyyy")
}
- birtParameters.facilityId = request.getParameter("facilityId");
- birtParameters.orderDateDateValue_fld0_op = fromOrderDate.toString();
- request.setAttribute("birtParameters", birtParameters);
- return "success";
+ birtParameters.facilityId = request.getParameter("facilityId")
+ birtParameters.orderDateDateValue_fld0_op = fromOrderDate.toString()
+ request.setAttribute("birtParameters", birtParameters)
+ return "success"
Modified: ofbiz/trunk/specialpurpose/birt/groovyScripts/order/CheckReportBy.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/groovyScripts/order/CheckReportBy.groovy?rev=1767764&r1=1767763&r2=1767764&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/birt/groovyScripts/order/CheckReportBy.groovy (original)
+++ ofbiz/trunk/specialpurpose/birt/groovyScripts/order/CheckReportBy.groovy Wed Nov 2 19:09:13 2016
@@ -17,51 +17,51 @@
* under the License.
*/
-import org.apache.ofbiz.base.util.UtilValidate;
+import org.apache.ofbiz.base.util.UtilValidate
-reportBy = parameters.reportBy;
-exportType = parameters.exportType;
+reportBy = parameters.reportBy
+exportType = parameters.exportType
if (UtilValidate.isEmpty(parameters.fromDate)) {
- request.setAttribute("_ERROR_MESSAGE_", "Please select From Date.");
- return "error";
+ request.setAttribute("_ERROR_MESSAGE_", "Please select From Date.")
+ return "error"
}
if (exportType == "pdf") {
if (reportBy == "day") {
- return "dayPDF";
+ return "dayPDF"
} else if (reportBy == "week") {
- return "weekPDF";
+ return "weekPDF"
} else if (reportBy == "month") {
- return "monthPDF";
+ return "monthPDF"
} else {
- request.setAttribute("_ERROR_MESSAGE_", "Please select Report By.");
- return "error";
+ request.setAttribute("_ERROR_MESSAGE_", "Please select Report By.")
+ return "error"
}
}
if (exportType == "excel") {
if (reportBy == "day") {
- return "dayExcel";
+ return "dayExcel"
} else if (reportBy == "week") {
- return "weekExcel";
+ return "weekExcel"
} else if (reportBy == "month") {
- return "monthExcel";
+ return "monthExcel"
} else {
- request.setAttribute("_ERROR_MESSAGE_", "Please select Report By.");
- return "error";
+ request.setAttribute("_ERROR_MESSAGE_", "Please select Report By.")
+ return "error"
}
}
if (exportType == "html") {
if (reportBy == "day") {
- return "dayHTML";
+ return "dayHTML"
} else if (reportBy == "week") {
- return "weekHTML";
+ return "weekHTML"
} else if (reportBy == "month") {
- return "monthHTML";
+ return "monthHTML"
} else {
- request.setAttribute("_ERROR_MESSAGE_", "Please select Report By.");
- return "error";
+ request.setAttribute("_ERROR_MESSAGE_", "Please select Report By.")
+ return "error"
}
}
Modified: ofbiz/trunk/specialpurpose/birt/groovyScripts/order/NetBeforeOverheadReport.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/groovyScripts/order/NetBeforeOverheadReport.groovy?rev=1767764&r1=1767763&r2=1767764&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/birt/groovyScripts/order/NetBeforeOverheadReport.groovy (original)
+++ ofbiz/trunk/specialpurpose/birt/groovyScripts/order/NetBeforeOverheadReport.groovy Wed Nov 2 19:09:13 2016
@@ -16,41 +16,41 @@
* specific language governing permissions and limitations
* under the License.
*/
-import org.apache.ofbiz.base.util.Debug;
-import org.apache.ofbiz.base.util.UtilDatetime;
-import java.sql.*;
+import org.apache.ofbiz.base.util.Debug
+import org.apache.ofbiz.base.util.UtilDatetime
+import java.sql.*
-productStoreId = parameters.productStoreId;
-DateTime = UtilDateTime.nowTimestamp();
-String DateStr = DateTime;
-DateDay = DateStr.substring(0,10);
-DateMonth = DateStr.substring(5,7);
-DateYear = DateStr.substring(0,4);
+productStoreId = parameters.productStoreId
+DateTime = UtilDateTime.nowTimestamp()
+String DateStr = DateTime
+DateDay = DateStr.substring(0,10)
+DateMonth = DateStr.substring(5,7)
+DateYear = DateStr.substring(0,4)
if (DateMonth == "01"||DateMonth == "03"||DateMonth == "05"||DateMonth == "07"||DateMonth == "08"||DateMonth == "10"||DateMonth == "12")
{
- NunberDate = 31;
+ NunberDate = 31
}
else if (DateMonth == "02")
{
- NunberDate = 29;
+ NunberDate = 29
}
else
{
- NunberDate = 30;
+ NunberDate = 30
}
-birtParameters = [:];
+birtParameters = [:]
try {
- birtParameters.productStoreId = productStoreId;
- birtParameters.DateDay = DateDay;
- birtParameters.DateMonth = DateMonth;
- birtParameters.DateYear = DateYear;
- birtParameters.NunberDate = NunberDate;
+ birtParameters.productStoreId = productStoreId
+ birtParameters.DateDay = DateDay
+ birtParameters.DateMonth = DateMonth
+ birtParameters.DateYear = DateYear
+ birtParameters.NunberDate = NunberDate
} catch (e) {
- Debug.logError(e, "");
+ Debug.logError(e, "")
}
-request.setAttribute("birtParameters", birtParameters);
+request.setAttribute("birtParameters", birtParameters)
-return "success";
+return "success"
Modified: ofbiz/trunk/specialpurpose/birt/groovyScripts/order/OrderByChannel.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/groovyScripts/order/OrderByChannel.groovy?rev=1767764&r1=1767763&r2=1767764&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/birt/groovyScripts/order/OrderByChannel.groovy (original)
+++ ofbiz/trunk/specialpurpose/birt/groovyScripts/order/OrderByChannel.groovy Wed Nov 2 19:09:13 2016
@@ -17,12 +17,12 @@
* under the License.
*/
-birtParameters = [:];
+birtParameters = [:]
if(request.getParameter("SalesChannel")){
- birtParameters.saleChannel = request.getParameter("SalesChannel");
+ birtParameters.saleChannel = request.getParameter("SalesChannel")
}else{
- birtParameters.saleChannel = "null";
+ birtParameters.saleChannel = "null"
}
-request.setAttribute("birtParameters", birtParameters);
+request.setAttribute("birtParameters", birtParameters)
-return "success";
+return "success"
Modified: ofbiz/trunk/specialpurpose/birt/groovyScripts/order/ProductDemandReport.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/groovyScripts/order/ProductDemandReport.groovy?rev=1767764&r1=1767763&r2=1767764&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/birt/groovyScripts/order/ProductDemandReport.groovy (original)
+++ ofbiz/trunk/specialpurpose/birt/groovyScripts/order/ProductDemandReport.groovy Wed Nov 2 19:09:13 2016
@@ -16,26 +16,26 @@
* specific language governing permissions and limitations
* under the License.
*/
-import org.apache.ofbiz.base.util.Debug;
-import org.apache.ofbiz.base.util.UtilDateTime;
-import java.sql.*;
-import com.ibm.icu.util.Calendar;
+import org.apache.ofbiz.base.util.Debug
+import org.apache.ofbiz.base.util.UtilDateTime
+import java.sql.*
+import com.ibm.icu.util.Calendar
-productStoreId = parameters.productStoreId;
-Calendar cal = UtilDateTime.toCalendar(UtilDateTime.nowTimestamp());
-int Week = cal.get(Calendar.WEEK_OF_YEAR);
-int Year = cal.get(Calendar.YEAR);
+productStoreId = parameters.productStoreId
+Calendar cal = UtilDateTime.toCalendar(UtilDateTime.nowTimestamp())
+int Week = cal.get(Calendar.WEEK_OF_YEAR)
+int Year = cal.get(Calendar.YEAR)
-birtParameters = [:];
+birtParameters = [:]
try
{
- birtParameters.productStoreId = productStoreId;
- birtParameters.Week = Week;
- birtParameters.Year = Year;
+ birtParameters.productStoreId = productStoreId
+ birtParameters.Week = Week
+ birtParameters.Year = Year
} catch (e) {
- Debug.logError(e, "");
+ Debug.logError(e, "")
}
-request.setAttribute("birtParameters", birtParameters);
+request.setAttribute("birtParameters", birtParameters)
-return "success";
+return "success"
Modified: ofbiz/trunk/specialpurpose/birt/groovyScripts/order/SalesReport.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/groovyScripts/order/SalesReport.groovy?rev=1767764&r1=1767763&r2=1767764&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/birt/groovyScripts/order/SalesReport.groovy (original)
+++ ofbiz/trunk/specialpurpose/birt/groovyScripts/order/SalesReport.groovy Wed Nov 2 19:09:13 2016
@@ -16,29 +16,29 @@
* specific language governing permissions and limitations
* under the License.
*/
-import org.apache.ofbiz.base.util.Debug;
-import java.sql.*;
+import org.apache.ofbiz.base.util.Debug
+import java.sql.*
-fromDateStr = parameters.fromDate;
-cal = Calendar.getInstance();
-cal.setTime(Date.valueOf(fromDateStr));
-int week = cal.get(Calendar.WEEK_OF_YEAR);
-int month = cal.get(Calendar.MONTH) + 1;
-int year = cal.get(Calendar.YEAR);
+fromDateStr = parameters.fromDate
+cal = Calendar.getInstance()
+cal.setTime(Date.valueOf(fromDateStr))
+int week = cal.get(Calendar.WEEK_OF_YEAR)
+int month = cal.get(Calendar.MONTH) + 1
+int year = cal.get(Calendar.YEAR)
-birtParameters = [:];
+birtParameters = [:]
try {
- birtParameters.reportBy = parameters.reportBy;
- birtParameters.fromDate = (Date.valueOf(fromDateStr))-2;
- birtParameters.thruDate = Date.valueOf(fromDateStr);
- birtParameters.lastDate = (Date.valueOf(fromDateStr))-7;
- birtParameters.thruWeek = week;
- birtParameters.thruMonth = month;
- birtParameters.thisYear = year;
+ birtParameters.reportBy = parameters.reportBy
+ birtParameters.fromDate = (Date.valueOf(fromDateStr))-2
+ birtParameters.thruDate = Date.valueOf(fromDateStr)
+ birtParameters.lastDate = (Date.valueOf(fromDateStr))-7
+ birtParameters.thruWeek = week
+ birtParameters.thruMonth = month
+ birtParameters.thisYear = year
} catch (e) {
- Debug.logError(e, "");
+ Debug.logError(e, "")
}
-request.setAttribute("birtParameters", birtParameters);
+request.setAttribute("birtParameters", birtParameters)
-return "success";
+return "success"
Modified: ofbiz/trunk/specialpurpose/ebay/groovyScripts/EbayAdvancedSearch.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/groovyScripts/EbayAdvancedSearch.groovy?rev=1767764&r1=1767763&r2=1767764&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebay/groovyScripts/EbayAdvancedSearch.groovy (original)
+++ ofbiz/trunk/specialpurpose/ebay/groovyScripts/EbayAdvancedSearch.groovy Wed Nov 2 19:09:13 2016
@@ -17,54 +17,54 @@
* under the License.
*/
-import org.apache.ofbiz.entity.util.EntityUtil;
-import org.apache.ofbiz.product.catalog.CatalogWorker;
-import org.apache.ofbiz.product.category.CategoryWorker;
-import org.apache.ofbiz.product.store.ProductStoreWorker;
+import org.apache.ofbiz.entity.util.EntityUtil
+import org.apache.ofbiz.product.catalog.CatalogWorker
+import org.apache.ofbiz.product.category.CategoryWorker
+import org.apache.ofbiz.product.store.ProductStoreWorker
-categoryIds = [];
-prodCatalogList = [];
-categoryList = [];
+categoryIds = []
+prodCatalogList = []
+categoryList = []
if (parameters.productStoreId) {
- productStoreId = parameters.productStoreId;
+ productStoreId = parameters.productStoreId
} else {
- productStoreId = ProductStoreWorker.getProductStoreId(request);
+ productStoreId = ProductStoreWorker.getProductStoreId(request)
}
-ebayConfigList = from("EbayConfig").queryList();
+ebayConfigList = from("EbayConfig").queryList()
if (productStoreId) {
- productStoreCatalogs = CatalogWorker.getStoreCatalogs(delegator, productStoreId);
+ productStoreCatalogs = CatalogWorker.getStoreCatalogs(delegator, productStoreId)
if (productStoreCatalogs) {
productStoreCatalogs.each { productStoreCatalog ->
- prodCatalog = from("ProdCatalog").where("prodCatalogId", productStoreCatalog.prodCatalogId).cache(true).queryOne();
- prodCatalogList.add(prodCatalog);
+ prodCatalog = from("ProdCatalog").where("prodCatalogId", productStoreCatalog.prodCatalogId).cache(true).queryOne()
+ prodCatalogList.add(prodCatalog)
}
}
}
-currentCatalogId = null;
+currentCatalogId = null
if (parameters.SEARCH_CATALOG_ID) {
- currentCatalogId = parameters.SEARCH_CATALOG_ID;
+ currentCatalogId = parameters.SEARCH_CATALOG_ID
} else if (prodCatalogList) {
- catalog = EntityUtil.getFirst(prodCatalogList);
- currentCatalogId = catalog.prodCatalogId;
+ catalog = EntityUtil.getFirst(prodCatalogList)
+ currentCatalogId = catalog.prodCatalogId
}
-topCategory = CatalogWorker.getCatalogTopEbayCategoryId(request, currentCatalogId);
+topCategory = CatalogWorker.getCatalogTopEbayCategoryId(request, currentCatalogId)
if (!topCategory) {
- topCategory = CatalogWorker.getCatalogTopCategoryId(request, currentCatalogId);
+ topCategory = CatalogWorker.getCatalogTopCategoryId(request, currentCatalogId)
}
if (topCategory) {
- CategoryWorker.getRelatedCategories(request, "topLevelList", topCategory, true);
+ CategoryWorker.getRelatedCategories(request, "topLevelList", topCategory, true)
if (request.getAttribute("topLevelList")) {
- categoryList = request.getAttribute("topLevelList");
+ categoryList = request.getAttribute("topLevelList")
} else {
- categoryIds.add(topCategory);
+ categoryIds.add(topCategory)
}
}
if (categoryList) {
- categoryIds = EntityUtil.getFieldListFromEntityList(categoryList, "productCategoryId", true);
+ categoryIds = EntityUtil.getFieldListFromEntityList(categoryList, "productCategoryId", true)
}
-context.ebayConfigList = ebayConfigList;
-context.categoryIds = categoryIds;
-context.productStoreId = productStoreId;
-context.prodCatalogList = prodCatalogList;
-context.searchCatalogId = currentCatalogId;
+context.ebayConfigList = ebayConfigList
+context.categoryIds = categoryIds
+context.productStoreId = productStoreId
+context.prodCatalogList = prodCatalogList
+context.searchCatalogId = currentCatalogId
Modified: ofbiz/trunk/specialpurpose/ebay/groovyScripts/EbayOrders.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/groovyScripts/EbayOrders.groovy?rev=1767764&r1=1767763&r2=1767764&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebay/groovyScripts/EbayOrders.groovy (original)
+++ ofbiz/trunk/specialpurpose/ebay/groovyScripts/EbayOrders.groovy Wed Nov 2 19:09:13 2016
@@ -18,5 +18,5 @@
*/
if (parameters.orderList) {
- session.setAttribute("orderList", parameters.orderList);
+ session.setAttribute("orderList", parameters.orderList)
}
Modified: ofbiz/trunk/specialpurpose/ebay/groovyScripts/ProductsExportToEbay.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/groovyScripts/ProductsExportToEbay.groovy?rev=1767764&r1=1767763&r2=1767764&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebay/groovyScripts/ProductsExportToEbay.groovy (original)
+++ ofbiz/trunk/specialpurpose/ebay/groovyScripts/ProductsExportToEbay.groovy Wed Nov 2 19:09:13 2016
@@ -16,54 +16,54 @@
* specific language governing permissions and limitations
* under the License.
*/
-import org.apache.ofbiz.entity.util.EntityUtil;
+import org.apache.ofbiz.entity.util.EntityUtil
-webSiteList = [];
-webSite = null;
+webSiteList = []
+webSite = null
if (parameters.productStoreId) {
- productStoreId = parameters.productStoreId;
- webSiteList = from("WebSite").where("productStoreId", productStoreId).queryList();
+ productStoreId = parameters.productStoreId
+ webSiteList = from("WebSite").where("productStoreId", productStoreId).queryList()
if (parameters.webSiteId) {
- webSite = from("WebSite").where("webSiteId", parameters.webSiteId).cache(true).queryOne();
- context.selectedWebSiteId = parameters.webSiteId;
+ webSite = from("WebSite").where("webSiteId", parameters.webSiteId).cache(true).queryOne()
+ context.selectedWebSiteId = parameters.webSiteId
} else if (webSiteList) {
- webSite = EntityUtil.getFirst(webSiteList);
- context.selectedWebSiteId = webSite.webSiteId;
+ webSite = EntityUtil.getFirst(webSiteList)
+ context.selectedWebSiteId = webSite.webSiteId
}
- context.productStoreId = productStoreId;
- context.webSiteList = webSiteList;
- countryCode = null;
+ context.productStoreId = productStoreId
+ context.webSiteList = webSiteList
+ countryCode = null
if (parameters.country) {
- countryCode = parameters.country;
+ countryCode = parameters.country
} else {
- countryCode = "US";
+ countryCode = "US"
}
- context.countryCode = countryCode;
+ context.countryCode = countryCode
if (webSite) {
- eBayConfig = from("EbayConfig").where("productStoreId", productStoreId).queryOne();
- context.customXml = eBayConfig.customXml;
- context.webSiteUrl = webSite.getString("standardContentPrefix");
+ eBayConfig = from("EbayConfig").where("productStoreId", productStoreId).queryOne()
+ context.customXml = eBayConfig.customXml
+ context.webSiteUrl = webSite.getString("standardContentPrefix")
- categoryCode = parameters.categoryCode;
- context.categoryCode = categoryCode;
- userLogin = parameters.userLogin;
+ categoryCode = parameters.categoryCode
+ context.categoryCode = categoryCode
+ userLogin = parameters.userLogin
if (productStoreId) {
- results = runService('getEbayCategories', [categoryCode : categoryCode, userLogin : userLogin, productStoreId : productStoreId]);
+ results = runService('getEbayCategories', [categoryCode : categoryCode, userLogin : userLogin, productStoreId : productStoreId])
}
if (results.categories) {
- context.categories = results.categories;
+ context.categories = results.categories
}
if (categoryCode) {
if (!"Y".equals(categoryCode.substring(0, 1)) && !"".equals(categoryCode)) {
- context.hideExportOptions = "Y";
+ context.hideExportOptions = "Y"
} else {
- context.hideExportOptions = "N";
+ context.hideExportOptions = "N"
}
} else {
- context.hideExportOptions = "N";
+ context.hideExportOptions = "N"
}
}
}
Modified: ofbiz/trunk/specialpurpose/ebay/groovyScripts/UpdatedEbayOrders.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/groovyScripts/UpdatedEbayOrders.groovy?rev=1767764&r1=1767763&r2=1767764&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebay/groovyScripts/UpdatedEbayOrders.groovy (original)
+++ ofbiz/trunk/specialpurpose/ebay/groovyScripts/UpdatedEbayOrders.groovy Wed Nov 2 19:09:13 2016
@@ -18,6 +18,6 @@
*/
if (session.getAttribute("orderList")) {
- session.removeAttribute("orderList");
- return "success";
+ session.removeAttribute("orderList")
+ return "success"
}
Modified: ofbiz/trunk/specialpurpose/ebaystore/groovyScripts/automationPreferences/GetDisputeInfo.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/groovyScripts/automationPreferences/GetDisputeInfo.groovy?rev=1767764&r1=1767763&r2=1767764&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebaystore/groovyScripts/automationPreferences/GetDisputeInfo.groovy (original)
+++ ofbiz/trunk/specialpurpose/ebaystore/groovyScripts/automationPreferences/GetDisputeInfo.groovy Wed Nov 2 19:09:13 2016
@@ -17,80 +17,80 @@
* under the License.
*/
-import com.ebay.soap.eBLBaseComponents.DisputeReasonCodeType;
-import com.ebay.soap.eBLBaseComponents.DisputeExplanationCodeType;
+import com.ebay.soap.eBLBaseComponents.DisputeReasonCodeType
+import com.ebay.soap.eBLBaseComponents.DisputeExplanationCodeType
public static String makeSpace(String text){
- String result = "";
+ String result = ""
for (int i=0; i<text.length(); i++) {
if (i < text.length()-1) {
if (String.valueOf(text.charAt(i+1)).equals(String.valueOf(text.charAt(i+1)).toUpperCase())) {
- result = result + String.valueOf(text.charAt(i)) + " " ;
+ result = result + String.valueOf(text.charAt(i)) + " "
} else {
- result = result + String.valueOf(text.charAt(i));
+ result = result + String.valueOf(text.charAt(i))
}
}else{
- result = result + String.valueOf(text.charAt(i));
+ result = result + String.valueOf(text.charAt(i))
}
}
- return result;
+ return result
}
-reasons = [];
-explanations = [];
+reasons = []
+explanations = []
-entry = [:];
-entry.put("reasonCode", DisputeReasonCodeType.BUYER_HAS_NOT_PAID.toString());
-entry.put("value", makeSpace(DisputeReasonCodeType.BUYER_HAS_NOT_PAID.value()));
-reasons.add(entry);
-entry = [:];
-entry.put("reasonCode", DisputeReasonCodeType.TRANSACTION_MUTUALLY_CANCELED.toString());
-entry.put("value", makeSpace(DisputeReasonCodeType.TRANSACTION_MUTUALLY_CANCELED.value()));
-reasons.add(entry);
+entry = [:]
+entry.put("reasonCode", DisputeReasonCodeType.BUYER_HAS_NOT_PAID.toString())
+entry.put("value", makeSpace(DisputeReasonCodeType.BUYER_HAS_NOT_PAID.value()))
+reasons.add(entry)
+entry = [:]
+entry.put("reasonCode", DisputeReasonCodeType.TRANSACTION_MUTUALLY_CANCELED.toString())
+entry.put("value", makeSpace(DisputeReasonCodeType.TRANSACTION_MUTUALLY_CANCELED.value()))
+reasons.add(entry)
-entry = [:];
-entry.put("explanationCode", DisputeExplanationCodeType.BUYER_HAS_NOT_RESPONDED.toString());
-entry.put("value", makeSpace(DisputeExplanationCodeType.BUYER_HAS_NOT_RESPONDED.value()));
-explanations.add(entry);
-entry = [:];
-entry.put("explanationCode", DisputeExplanationCodeType.BUYER_REFUSED_TO_PAY.toString());
-entry.put("value", makeSpace(DisputeExplanationCodeType.BUYER_REFUSED_TO_PAY.value()));
-explanations.add(entry);
-entry = [:];
-entry.put("explanationCode", DisputeExplanationCodeType.BUYER_RETURNED_ITEM_FOR_REFUND.toString());
-entry.put("value", makeSpace(DisputeExplanationCodeType.BUYER_RETURNED_ITEM_FOR_REFUND.value()));
-explanations.add(entry);
-entry = [:];
-entry.put("explanationCode", DisputeExplanationCodeType.UNABLE_TO_RESOLVE_TERMS.toString());
-entry.put("value", makeSpace(DisputeExplanationCodeType.UNABLE_TO_RESOLVE_TERMS.value()));
-explanations.add(entry);
-entry = [:];
-entry.put("explanationCode", DisputeExplanationCodeType.BUYER_PURCHASING_MISTAKE.toString());
-entry.put("value", makeSpace(DisputeExplanationCodeType.BUYER_PURCHASING_MISTAKE.value()));
-explanations.add(entry);
-entry = [:];
-entry.put("explanationCode", DisputeExplanationCodeType.SHIP_COUNTRY_NOT_SUPPORTED.toString());
-entry.put("value", makeSpace(DisputeExplanationCodeType.SHIP_COUNTRY_NOT_SUPPORTED.value()));
-explanations.add(entry);
-entry = [:];
-entry.put("explanationCode", DisputeExplanationCodeType.SHIPPING_ADDRESS_NOT_CONFIRMED.toString());
-entry.put("value", makeSpace(DisputeExplanationCodeType.SHIPPING_ADDRESS_NOT_CONFIRMED.value()));
-explanations.add(entry);
-entry = [:];
-entry.put("explanationCode", DisputeExplanationCodeType.PAYMENT_METHOD_NOT_SUPPORTED.toString());
-entry.put("value", makeSpace(DisputeExplanationCodeType.PAYMENT_METHOD_NOT_SUPPORTED.value()));
-explanations.add(entry);
-entry = [:];
-entry.put("explanationCode", DisputeExplanationCodeType.BUYER_NO_LONGER_REGISTERED.toString());
-entry.put("value", makeSpace(DisputeExplanationCodeType.BUYER_NO_LONGER_REGISTERED.value()));
-explanations.add(entry);
-entry = [:];
-entry.put("explanationCode", DisputeExplanationCodeType.BUYER_NO_LONGER_REGISTERED.toString());
-entry.put("value", makeSpace(DisputeExplanationCodeType.BUYER_NO_LONGER_REGISTERED.value()));
-explanations.add(entry);
-entry = [:];
-entry.put("explanationCode", DisputeExplanationCodeType.OTHER_EXPLANATION.toString());
-entry.put("value", makeSpace(DisputeExplanationCodeType.OTHER_EXPLANATION.value()));
-explanations.add(entry);
+entry = [:]
+entry.put("explanationCode", DisputeExplanationCodeType.BUYER_HAS_NOT_RESPONDED.toString())
+entry.put("value", makeSpace(DisputeExplanationCodeType.BUYER_HAS_NOT_RESPONDED.value()))
+explanations.add(entry)
+entry = [:]
+entry.put("explanationCode", DisputeExplanationCodeType.BUYER_REFUSED_TO_PAY.toString())
+entry.put("value", makeSpace(DisputeExplanationCodeType.BUYER_REFUSED_TO_PAY.value()))
+explanations.add(entry)
+entry = [:]
+entry.put("explanationCode", DisputeExplanationCodeType.BUYER_RETURNED_ITEM_FOR_REFUND.toString())
+entry.put("value", makeSpace(DisputeExplanationCodeType.BUYER_RETURNED_ITEM_FOR_REFUND.value()))
+explanations.add(entry)
+entry = [:]
+entry.put("explanationCode", DisputeExplanationCodeType.UNABLE_TO_RESOLVE_TERMS.toString())
+entry.put("value", makeSpace(DisputeExplanationCodeType.UNABLE_TO_RESOLVE_TERMS.value()))
+explanations.add(entry)
+entry = [:]
+entry.put("explanationCode", DisputeExplanationCodeType.BUYER_PURCHASING_MISTAKE.toString())
+entry.put("value", makeSpace(DisputeExplanationCodeType.BUYER_PURCHASING_MISTAKE.value()))
+explanations.add(entry)
+entry = [:]
+entry.put("explanationCode", DisputeExplanationCodeType.SHIP_COUNTRY_NOT_SUPPORTED.toString())
+entry.put("value", makeSpace(DisputeExplanationCodeType.SHIP_COUNTRY_NOT_SUPPORTED.value()))
+explanations.add(entry)
+entry = [:]
+entry.put("explanationCode", DisputeExplanationCodeType.SHIPPING_ADDRESS_NOT_CONFIRMED.toString())
+entry.put("value", makeSpace(DisputeExplanationCodeType.SHIPPING_ADDRESS_NOT_CONFIRMED.value()))
+explanations.add(entry)
+entry = [:]
+entry.put("explanationCode", DisputeExplanationCodeType.PAYMENT_METHOD_NOT_SUPPORTED.toString())
+entry.put("value", makeSpace(DisputeExplanationCodeType.PAYMENT_METHOD_NOT_SUPPORTED.value()))
+explanations.add(entry)
+entry = [:]
+entry.put("explanationCode", DisputeExplanationCodeType.BUYER_NO_LONGER_REGISTERED.toString())
+entry.put("value", makeSpace(DisputeExplanationCodeType.BUYER_NO_LONGER_REGISTERED.value()))
+explanations.add(entry)
+entry = [:]
+entry.put("explanationCode", DisputeExplanationCodeType.BUYER_NO_LONGER_REGISTERED.toString())
+entry.put("value", makeSpace(DisputeExplanationCodeType.BUYER_NO_LONGER_REGISTERED.value()))
+explanations.add(entry)
+entry = [:]
+entry.put("explanationCode", DisputeExplanationCodeType.OTHER_EXPLANATION.toString())
+entry.put("value", makeSpace(DisputeExplanationCodeType.OTHER_EXPLANATION.value()))
+explanations.add(entry)
-context.reasons = reasons;
-context.explanations = explanations;
+context.reasons = reasons
+context.explanations = explanations
Modified: ofbiz/trunk/specialpurpose/ebaystore/groovyScripts/automationPreferences/GetEbayJobsandbox.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/groovyScripts/automationPreferences/GetEbayJobsandbox.groovy?rev=1767764&r1=1767763&r2=1767764&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebaystore/groovyScripts/automationPreferences/GetEbayJobsandbox.groovy (original)
+++ ofbiz/trunk/specialpurpose/ebaystore/groovyScripts/automationPreferences/GetEbayJobsandbox.groovy Wed Nov 2 19:09:13 2016
@@ -17,13 +17,13 @@
* under the License.
*/
-jobSandboxs = from("JobSandbox").where("authUserLoginId", userLoginId).queryList();
+jobSandboxs = from("JobSandbox").where("authUserLoginId", userLoginId).queryList()
job = null
-jobId = null;
+jobId = null
if(jobSandboxs) {
- job = jobSandboxs.get(0);
+ job = jobSandboxs.get(0)
} else {
- jobId = delegator.getNextSeqId("JobSandbox");
+ jobId = delegator.getNextSeqId("JobSandbox")
}
-context.jobId = jobId;
-context.job = job;
+context.jobId = jobId
+context.job = job
Modified: ofbiz/trunk/specialpurpose/ebaystore/groovyScripts/email/GetProductStoreEmailTemplate.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/groovyScripts/email/GetProductStoreEmailTemplate.groovy?rev=1767764&r1=1767763&r2=1767764&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebaystore/groovyScripts/email/GetProductStoreEmailTemplate.groovy (original)
+++ ofbiz/trunk/specialpurpose/ebaystore/groovyScripts/email/GetProductStoreEmailTemplate.groovy Wed Nov 2 19:09:13 2016
@@ -17,18 +17,18 @@
* under the License.
*/
-import org.apache.ofbiz.base.util.*;
+import org.apache.ofbiz.base.util.*
-contentId = null;
-contentRoles = from("ContentRole").where("partyId", partyId, "roleTypeId", "OWNER").queryList();
+contentId = null
+contentRoles = from("ContentRole").where("partyId", partyId, "roleTypeId", "OWNER").queryList()
if (contentRoles.size() != 0) {
contentRoles.each { contentRole->
- contents = from("Content").where("contentId", contentRole.getString("contentId"), "ownerContentId", emailType).queryList();
+ contents = from("Content").where("contentId", contentRole.getString("contentId"), "ownerContentId", emailType).queryList()
if (contents.size() != 0) {
if (emailType.equals(contents.get(0).getString("ownerContentId"))) {
- contentId = contents.get(0).getString("contentId");
+ contentId = contents.get(0).getString("contentId")
}
}
}
}
-context.contentId = contentId;
+context.contentId = contentId