dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #12795
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 4000: indentation fixes
------------------------------------------------------------
revno: 4000
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2011-06-23 11:20:44 +0300
message:
indentation fixes
modified:
dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/META-INF/dhis/beans.xml
dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/struts.xml
dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/entry.js
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/META-INF/dhis/beans.xml 2011-05-31 07:54:15 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/META-INF/dhis/beans.xml 2011-06-23 08:20:44 +0000
@@ -1,142 +1,151 @@
<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="
+<beans xmlns="http://www.springframework.org/schema/beans"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd";>
- <bean id="org.hisp.dhis.de.action.EmptyAction" class="org.hisp.dhis.de.action.EmptyAction" />
-
- <bean id="org.hisp.dhis.de.comments.StandardCommentsManager" class="org.hisp.dhis.de.comments.DefaultStandardCommentsManager" init-method="init">
- <property name="standardCommentsFile" value="standard_comments.xml" />
- </bean>
-
- <bean id="org.hisp.dhis.de.history.HistoryRetriever" class="org.hisp.dhis.de.history.DefaultHistoryRetriever">
- <property name="minMaxDataElementService" ref="org.hisp.dhis.minmax.MinMaxDataElementService" />
- <property name="dataValueService" ref="org.hisp.dhis.datavalue.DataValueService" />
- <property name="periodService" ref="org.hisp.dhis.period.PeriodService" />
- </bean>
-
- <bean id="org.hisp.dhis.de.state.SelectedStateManager" class="org.hisp.dhis.de.state.DefaultSelectedStateManager">
- <property name="dataSetService" ref="org.hisp.dhis.dataset.DataSetService" />
- <property name="selectionManager" ref="org.hisp.dhis.ouwt.manager.OrganisationUnitSelectionManager" />
- <property name="userService" ref="org.hisp.dhis.user.UserService" />
- <property name="currentUserService" ref="org.hisp.dhis.user.CurrentUserService" />
- <property name="periodService" ref="org.hisp.dhis.period.PeriodService" />
- </bean>
+ <bean id="org.hisp.dhis.de.action.EmptyAction" class="org.hisp.dhis.de.action.EmptyAction" />
+
+ <bean id="org.hisp.dhis.de.comments.StandardCommentsManager" class="org.hisp.dhis.de.comments.DefaultStandardCommentsManager"
+ init-method="init">
+ <property name="standardCommentsFile" value="standard_comments.xml" />
+ </bean>
+
+ <bean id="org.hisp.dhis.de.history.HistoryRetriever" class="org.hisp.dhis.de.history.DefaultHistoryRetriever">
+ <property name="minMaxDataElementService" ref="org.hisp.dhis.minmax.MinMaxDataElementService" />
+ <property name="dataValueService" ref="org.hisp.dhis.datavalue.DataValueService" />
+ <property name="periodService" ref="org.hisp.dhis.period.PeriodService" />
+ </bean>
+
+ <bean id="org.hisp.dhis.de.state.SelectedStateManager" class="org.hisp.dhis.de.state.DefaultSelectedStateManager">
+ <property name="dataSetService" ref="org.hisp.dhis.dataset.DataSetService" />
+ <property name="selectionManager" ref="org.hisp.dhis.ouwt.manager.OrganisationUnitSelectionManager" />
+ <property name="userService" ref="org.hisp.dhis.user.UserService" />
+ <property name="currentUserService" ref="org.hisp.dhis.user.CurrentUserService" />
+ <property name="periodService" ref="org.hisp.dhis.period.PeriodService" />
+ </bean>
<!-- Actions -->
- <bean id="org.hisp.dhis.de.action.LoadOrganisationUnitAction" class="org.hisp.dhis.de.action.LoadOrganisationUnitAction" scope="prototype">
- <property name="selectedStateManager" ref="org.hisp.dhis.de.state.SelectedStateManager" />
- </bean>
-
- <bean id="org.hisp.dhis.de.action.LoadDataSetsAction" class="org.hisp.dhis.de.action.LoadDataSetsAction" scope="prototype">
- <property name="selectedStateManager" ref="org.hisp.dhis.de.state.SelectedStateManager" />
- </bean>
-
- <bean id="org.hisp.dhis.de.action.LoadPeriodsAction" class="org.hisp.dhis.de.action.LoadPeriodsAction" scope="prototype">
- <property name="selectedStateManager" ref="org.hisp.dhis.de.state.SelectedStateManager" />
- <property name="dataSetService" ref="org.hisp.dhis.dataset.DataSetService" />
- <property name="expressionService" ref="org.hisp.dhis.expression.ExpressionService" />
- </bean>
-
- <bean id="org.hisp.dhis.de.action.LoadNextPreviousPeriodsAction" class="org.hisp.dhis.de.action.LoadNextPreviousPeriodsAction" scope="prototype">
- <property name="selectedStateManager" ref="org.hisp.dhis.de.state.SelectedStateManager" />
- </bean>
-
- <bean id="org.hisp.dhis.de.action.LoadDisplayModesAction" class="org.hisp.dhis.de.action.LoadDisplayModesAction" scope="prototype">
- <property name="selectedStateManager" ref="org.hisp.dhis.de.state.SelectedStateManager" />
- </bean>
-
- <bean id="org.hisp.dhis.de.action.SelectAction" class="org.hisp.dhis.de.action.SelectAction" scope="prototype">
- <property name="dataEntryFormService" ref="org.hisp.dhis.dataentryform.DataEntryFormService" />
- <property name="dataElementService" ref="org.hisp.dhis.dataelement.DataElementService" />
- <property name="dataSetLockService" ref="org.hisp.dhis.datalock.DataSetLockService" />
- <property name="selectedStateManager" ref="org.hisp.dhis.de.state.SelectedStateManager" />
- <property name="registrationService" ref="org.hisp.dhis.dataset.CompleteDataSetRegistrationService" />
- <property name="dataValueService" ref="org.hisp.dhis.datavalue.DataValueService" />
- <property name="standardCommentsManager" ref="org.hisp.dhis.de.comments.StandardCommentsManager" />
- <property name="minMaxDataElementService" ref="org.hisp.dhis.minmax.MinMaxDataElementService" />
- <property name="categoryService" ref="org.hisp.dhis.dataelement.DataElementCategoryService" />
- </bean>
-
- <bean id="org.hisp.dhis.de.action.SaveValueAction" class="org.hisp.dhis.de.action.SaveValueAction" scope="prototype">
- <property name="currentUserService" ref="org.hisp.dhis.user.CurrentUserService" />
- <property name="dataElementService" ref="org.hisp.dhis.dataelement.DataElementService" />
- <property name="dataValueService" ref="org.hisp.dhis.datavalue.DataValueService" />
- <property name="selectedStateManager" ref="org.hisp.dhis.de.state.SelectedStateManager" />
- <property name="categoryService" ref="org.hisp.dhis.dataelement.DataElementCategoryService" />
- <property name="organisationUnitService" ref="org.hisp.dhis.organisationunit.OrganisationUnitService" />
- </bean>
-
- <bean id="org.hisp.dhis.de.action.SaveCommentAction" class="org.hisp.dhis.de.action.SaveCommentAction" scope="prototype">
- <property name="currentUserService" ref="org.hisp.dhis.user.CurrentUserService" />
- <property name="dataElementService" ref="org.hisp.dhis.dataelement.DataElementService" />
- <property name="dataValueService" ref="org.hisp.dhis.datavalue.DataValueService" />
- <property name="selectedStateManager" ref="org.hisp.dhis.de.state.SelectedStateManager" />
- <property name="categoryService" ref="org.hisp.dhis.dataelement.DataElementCategoryService" />
- <property name="organisationUnitService" ref="org.hisp.dhis.organisationunit.OrganisationUnitService" />
- </bean>
-
- <bean id="org.hisp.dhis.de.action.SaveMinMaxLimitsAction" class="org.hisp.dhis.de.action.SaveMinMaxLimitsAction" scope="prototype">
- <property name="minMaxDataElementService" ref="org.hisp.dhis.minmax.MinMaxDataElementService" />
- <property name="organisationUnitService" ref="org.hisp.dhis.organisationunit.OrganisationUnitService" />
- <property name="dataElementService" ref="org.hisp.dhis.dataelement.DataElementService" />
- <property name="categoryService" ref="org.hisp.dhis.dataelement.DataElementCategoryService" />
- </bean>
-
- <bean id="org.hisp.dhis.de.action.RemoveMinMaxLimitsAction" class="org.hisp.dhis.de.action.RemoveMinMaxLimitsAction" scope="prototype">
- <property name="minMaxDataElementService" ref="org.hisp.dhis.minmax.MinMaxDataElementService" />
- <property name="organisationUnitService" ref="org.hisp.dhis.organisationunit.OrganisationUnitService" />
- <property name="dataElementService" ref="org.hisp.dhis.dataelement.DataElementService" />
- <property name="categoryService" ref="org.hisp.dhis.dataelement.DataElementCategoryService" />
- </bean>
-
- <bean id="org.hisp.dhis.de.action.HistoryAction" class="org.hisp.dhis.de.action.HistoryAction" scope="prototype">
- <property name="historyRetriever" ref="org.hisp.dhis.de.history.HistoryRetriever" />
- <property name="dataElementService" ref="org.hisp.dhis.dataelement.DataElementService" />
- <property name="selectedStateManager" ref="org.hisp.dhis.de.state.SelectedStateManager" />
- <property name="categoryService" ref="org.hisp.dhis.dataelement.DataElementCategoryService" />
- <property name="dataValueService" ref="org.hisp.dhis.datavalue.DataValueService" />
- <property name="standardCommentsManager" ref="org.hisp.dhis.de.comments.StandardCommentsManager" />
- <property name="dataValueAuditService" ref="org.hisp.dhis.datavalue.DataValueAuditService" />
- </bean>
-
- <bean id="org.hisp.dhis.de.action.RegisterCompleteDataSetAction" class="org.hisp.dhis.de.action.RegisterCompleteDataSetAction" scope="prototype">
- <property name="registrationService" ref="org.hisp.dhis.dataset.CompleteDataSetRegistrationService" />
- <property name="selectedStateManager" ref="org.hisp.dhis.de.state.SelectedStateManager" />
- </bean>
-
- <bean id="org.hisp.dhis.de.action.UndoCompleteDataSetAction" class="org.hisp.dhis.de.action.UndoCompleteDataSetAction" scope="prototype">
- <property name="registrationService" ref="org.hisp.dhis.dataset.CompleteDataSetRegistrationService" />
- <property name="selectedStateManager" ref="org.hisp.dhis.de.state.SelectedStateManager" />
- </bean>
-
- <bean id="org.hisp.dhis.de.action.ValidationAction" class="org.hisp.dhis.de.action.ValidationAction" scope="prototype">
- <property name="validationRuleService" ref="org.hisp.dhis.validation.ValidationRuleService" />
- <property name="expressionService" ref="org.hisp.dhis.expression.ExpressionService" />
- <property name="selectedStateManager" ref="org.hisp.dhis.de.state.SelectedStateManager" />
- <property name="periodService" ref="org.hisp.dhis.period.PeriodService" />
- <property name="stdDevOutlierAnalysisService" ref="org.hisp.dhis.dataanalysis.StdDevOutlierAnalysisService"/>
- <property name="minMaxOutlierAnalysisService" ref="org.hisp.dhis.dataanalysis.MinMaxOutlierAnalysisService"/>
- <property name="minMaxValuesGenerationService" ref="org.hisp.dhis.minmax.validation.MinMaxValuesGenerationService"/>
- <property name="minMaxDataElementService" ref="org.hisp.dhis.minmax.MinMaxDataElementService"/>
- <property name="systemSettingManager" ref="org.hisp.dhis.options.SystemSettingManager"/>
- </bean>
-
- <bean id="org.hisp.dhis.de.action.MarkForFollowupAction" class="org.hisp.dhis.de.action.MarkForFollowupAction" scope="prototype">
- <property name="dataValueService" ref="org.hisp.dhis.datavalue.DataValueService"/>
- <property name="dataElementService" ref="org.hisp.dhis.dataelement.DataElementService"/>
- <property name="periodService" ref="org.hisp.dhis.period.PeriodService"/>
- <property name="organisationUnitService" ref="org.hisp.dhis.organisationunit.OrganisationUnitService"/>
- <property name="categoryService" ref="org.hisp.dhis.dataelement.DataElementCategoryService"/>
- </bean>
-
- <bean id="org.hisp.dhis.de.action.GetHistoryChartAction" class="org.hisp.dhis.de.action.GetHistoryChartAction" scope="prototype">
- <property name="dataElementService" ref="org.hisp.dhis.dataelement.DataElementService"/>
- <property name="categoryService" ref="org.hisp.dhis.dataelement.DataElementCategoryService"/>
- <property name="selectedStateManager" ref="org.hisp.dhis.de.state.SelectedStateManager" />
- <property name="chartService" ref="org.hisp.dhis.chart.ChartService"/>
- </bean>
-
+ <bean id="org.hisp.dhis.de.action.LoadOrganisationUnitAction" class="org.hisp.dhis.de.action.LoadOrganisationUnitAction"
+ scope="prototype">
+ <property name="selectedStateManager" ref="org.hisp.dhis.de.state.SelectedStateManager" />
+ </bean>
+
+ <bean id="org.hisp.dhis.de.action.LoadDataSetsAction" class="org.hisp.dhis.de.action.LoadDataSetsAction" scope="prototype">
+ <property name="selectedStateManager" ref="org.hisp.dhis.de.state.SelectedStateManager" />
+ </bean>
+
+ <bean id="org.hisp.dhis.de.action.LoadPeriodsAction" class="org.hisp.dhis.de.action.LoadPeriodsAction" scope="prototype">
+ <property name="selectedStateManager" ref="org.hisp.dhis.de.state.SelectedStateManager" />
+ <property name="dataSetService" ref="org.hisp.dhis.dataset.DataSetService" />
+ <property name="expressionService" ref="org.hisp.dhis.expression.ExpressionService" />
+ </bean>
+
+ <bean id="org.hisp.dhis.de.action.LoadNextPreviousPeriodsAction" class="org.hisp.dhis.de.action.LoadNextPreviousPeriodsAction"
+ scope="prototype">
+ <property name="selectedStateManager" ref="org.hisp.dhis.de.state.SelectedStateManager" />
+ </bean>
+
+ <bean id="org.hisp.dhis.de.action.LoadDisplayModesAction" class="org.hisp.dhis.de.action.LoadDisplayModesAction"
+ scope="prototype">
+ <property name="selectedStateManager" ref="org.hisp.dhis.de.state.SelectedStateManager" />
+ </bean>
+
+ <bean id="org.hisp.dhis.de.action.SelectAction" class="org.hisp.dhis.de.action.SelectAction" scope="prototype">
+ <property name="dataEntryFormService" ref="org.hisp.dhis.dataentryform.DataEntryFormService" />
+ <property name="dataElementService" ref="org.hisp.dhis.dataelement.DataElementService" />
+ <property name="dataSetLockService" ref="org.hisp.dhis.datalock.DataSetLockService" />
+ <property name="selectedStateManager" ref="org.hisp.dhis.de.state.SelectedStateManager" />
+ <property name="registrationService" ref="org.hisp.dhis.dataset.CompleteDataSetRegistrationService" />
+ <property name="dataValueService" ref="org.hisp.dhis.datavalue.DataValueService" />
+ <property name="standardCommentsManager" ref="org.hisp.dhis.de.comments.StandardCommentsManager" />
+ <property name="minMaxDataElementService" ref="org.hisp.dhis.minmax.MinMaxDataElementService" />
+ <property name="categoryService" ref="org.hisp.dhis.dataelement.DataElementCategoryService" />
+ </bean>
+
+ <bean id="org.hisp.dhis.de.action.SaveValueAction" class="org.hisp.dhis.de.action.SaveValueAction" scope="prototype">
+ <property name="currentUserService" ref="org.hisp.dhis.user.CurrentUserService" />
+ <property name="dataElementService" ref="org.hisp.dhis.dataelement.DataElementService" />
+ <property name="dataValueService" ref="org.hisp.dhis.datavalue.DataValueService" />
+ <property name="selectedStateManager" ref="org.hisp.dhis.de.state.SelectedStateManager" />
+ <property name="categoryService" ref="org.hisp.dhis.dataelement.DataElementCategoryService" />
+ <property name="organisationUnitService" ref="org.hisp.dhis.organisationunit.OrganisationUnitService" />
+ </bean>
+
+ <bean id="org.hisp.dhis.de.action.SaveCommentAction" class="org.hisp.dhis.de.action.SaveCommentAction" scope="prototype">
+ <property name="currentUserService" ref="org.hisp.dhis.user.CurrentUserService" />
+ <property name="dataElementService" ref="org.hisp.dhis.dataelement.DataElementService" />
+ <property name="dataValueService" ref="org.hisp.dhis.datavalue.DataValueService" />
+ <property name="selectedStateManager" ref="org.hisp.dhis.de.state.SelectedStateManager" />
+ <property name="categoryService" ref="org.hisp.dhis.dataelement.DataElementCategoryService" />
+ <property name="organisationUnitService" ref="org.hisp.dhis.organisationunit.OrganisationUnitService" />
+ </bean>
+
+ <bean id="org.hisp.dhis.de.action.SaveMinMaxLimitsAction" class="org.hisp.dhis.de.action.SaveMinMaxLimitsAction"
+ scope="prototype">
+ <property name="minMaxDataElementService" ref="org.hisp.dhis.minmax.MinMaxDataElementService" />
+ <property name="organisationUnitService" ref="org.hisp.dhis.organisationunit.OrganisationUnitService" />
+ <property name="dataElementService" ref="org.hisp.dhis.dataelement.DataElementService" />
+ <property name="categoryService" ref="org.hisp.dhis.dataelement.DataElementCategoryService" />
+ </bean>
+
+ <bean id="org.hisp.dhis.de.action.RemoveMinMaxLimitsAction" class="org.hisp.dhis.de.action.RemoveMinMaxLimitsAction"
+ scope="prototype">
+ <property name="minMaxDataElementService" ref="org.hisp.dhis.minmax.MinMaxDataElementService" />
+ <property name="organisationUnitService" ref="org.hisp.dhis.organisationunit.OrganisationUnitService" />
+ <property name="dataElementService" ref="org.hisp.dhis.dataelement.DataElementService" />
+ <property name="categoryService" ref="org.hisp.dhis.dataelement.DataElementCategoryService" />
+ </bean>
+
+ <bean id="org.hisp.dhis.de.action.HistoryAction" class="org.hisp.dhis.de.action.HistoryAction" scope="prototype">
+ <property name="historyRetriever" ref="org.hisp.dhis.de.history.HistoryRetriever" />
+ <property name="dataElementService" ref="org.hisp.dhis.dataelement.DataElementService" />
+ <property name="selectedStateManager" ref="org.hisp.dhis.de.state.SelectedStateManager" />
+ <property name="categoryService" ref="org.hisp.dhis.dataelement.DataElementCategoryService" />
+ <property name="dataValueService" ref="org.hisp.dhis.datavalue.DataValueService" />
+ <property name="standardCommentsManager" ref="org.hisp.dhis.de.comments.StandardCommentsManager" />
+ <property name="dataValueAuditService" ref="org.hisp.dhis.datavalue.DataValueAuditService" />
+ </bean>
+
+ <bean id="org.hisp.dhis.de.action.RegisterCompleteDataSetAction" class="org.hisp.dhis.de.action.RegisterCompleteDataSetAction"
+ scope="prototype">
+ <property name="registrationService" ref="org.hisp.dhis.dataset.CompleteDataSetRegistrationService" />
+ <property name="selectedStateManager" ref="org.hisp.dhis.de.state.SelectedStateManager" />
+ </bean>
+
+ <bean id="org.hisp.dhis.de.action.UndoCompleteDataSetAction" class="org.hisp.dhis.de.action.UndoCompleteDataSetAction"
+ scope="prototype">
+ <property name="registrationService" ref="org.hisp.dhis.dataset.CompleteDataSetRegistrationService" />
+ <property name="selectedStateManager" ref="org.hisp.dhis.de.state.SelectedStateManager" />
+ </bean>
+
+ <bean id="org.hisp.dhis.de.action.ValidationAction" class="org.hisp.dhis.de.action.ValidationAction" scope="prototype">
+ <property name="validationRuleService" ref="org.hisp.dhis.validation.ValidationRuleService" />
+ <property name="expressionService" ref="org.hisp.dhis.expression.ExpressionService" />
+ <property name="selectedStateManager" ref="org.hisp.dhis.de.state.SelectedStateManager" />
+ <property name="periodService" ref="org.hisp.dhis.period.PeriodService" />
+ <property name="stdDevOutlierAnalysisService" ref="org.hisp.dhis.dataanalysis.StdDevOutlierAnalysisService" />
+ <property name="minMaxOutlierAnalysisService" ref="org.hisp.dhis.dataanalysis.MinMaxOutlierAnalysisService" />
+ <property name="minMaxValuesGenerationService" ref="org.hisp.dhis.minmax.validation.MinMaxValuesGenerationService" />
+ <property name="minMaxDataElementService" ref="org.hisp.dhis.minmax.MinMaxDataElementService" />
+ <property name="systemSettingManager" ref="org.hisp.dhis.options.SystemSettingManager" />
+ </bean>
+
+ <bean id="org.hisp.dhis.de.action.MarkForFollowupAction" class="org.hisp.dhis.de.action.MarkForFollowupAction"
+ scope="prototype">
+ <property name="dataValueService" ref="org.hisp.dhis.datavalue.DataValueService" />
+ <property name="dataElementService" ref="org.hisp.dhis.dataelement.DataElementService" />
+ <property name="periodService" ref="org.hisp.dhis.period.PeriodService" />
+ <property name="organisationUnitService" ref="org.hisp.dhis.organisationunit.OrganisationUnitService" />
+ <property name="categoryService" ref="org.hisp.dhis.dataelement.DataElementCategoryService" />
+ </bean>
+
+ <bean id="org.hisp.dhis.de.action.GetHistoryChartAction" class="org.hisp.dhis.de.action.GetHistoryChartAction"
+ scope="prototype">
+ <property name="dataElementService" ref="org.hisp.dhis.dataelement.DataElementService" />
+ <property name="categoryService" ref="org.hisp.dhis.dataelement.DataElementCategoryService" />
+ <property name="selectedStateManager" ref="org.hisp.dhis.de.state.SelectedStateManager" />
+ <property name="chartService" ref="org.hisp.dhis.chart.ChartService" />
+ </bean>
+
</beans>
=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/struts.xml 2011-05-31 07:54:15 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/struts.xml 2011-06-23 08:20:44 +0000
@@ -4,109 +4,108 @@
"http://struts.apache.org/dtds/struts-2.0.dtd";>
<struts>
- <include file="dhis-web-commons.xml" />
-
- <package name="dhis-web-dataentry" extends="dhis-web-commons"
- namespace="/dhis-web-dataentry">
-
- <action name="index" class="org.hisp.dhis.de.action.EmptyAction">
- <result name="success" type="redirect">displayForm.action</result>
- </action>
-
- <action name="displayForm" class="org.hisp.dhis.de.action.LoadOrganisationUnitAction">
- <interceptor-ref name="organisationUnitTreeStack" />
- <result name="success" type="velocity">/main.vm</result>
- <param name="page">/dhis-web-dataentry/select.vm</param>
- <param name="menu">/dhis-web-dataentry/menu.vm</param>
- <param name="menuTreeHeight">420</param>
- <param name="javascripts">../dhis-web-commons/ouwt/ouwt.js,javascript/form.js,javascript/entry.js</param>
- <param name="stylesheets">style/dhis-web-dataentry.css</param>
- </action>
-
- <action name="loadDataSets" class="org.hisp.dhis.de.action.LoadDataSetsAction">
- <result name="success" type="velocity-json">/dhis-web-dataentry/responseDataSets.vm</result>
- </action>
-
- <action name="loadPeriods" class="org.hisp.dhis.de.action.LoadPeriodsAction">
- <result name="success" type="velocity-json">/dhis-web-dataentry/responsePeriods.vm</result>
- </action>
-
- <action name="loadNextPreviousPeriods" class="org.hisp.dhis.de.action.LoadNextPreviousPeriodsAction">
- <result name="success" type="velocity-json">../dhis-web-commons/ajax/jsonPeriods.vm</result>
- </action>
-
- <action name="loadDisplayModes" class="org.hisp.dhis.de.action.LoadDisplayModesAction">
- <result name="success" type="velocity-json">/dhis-web-dataentry/responseDisplayModes.vm</result>
- </action>
-
- <action name="select" class="org.hisp.dhis.de.action.SelectAction">
- <result name="customform" type="velocity">/dhis-web-dataentry/customForm.vm</result>
- <result name="sectionform" type="velocity">/dhis-web-dataentry/sectionForm.vm</result>
- <result name="defaultform" type="velocity">/dhis-web-dataentry/defaultForm.vm</result>
- <result name="input" type="velocity">/dhis-web-dataentry/responseVoid.vm</result>
- </action>
-
- <action name="saveValue" class="org.hisp.dhis.de.action.SaveValueAction">
- <result name="success" type="velocity-json">/dhis-web-dataentry/status.vm</result>
- <param name="onExceptionReturn">plainTextError</param>
- <param name="requiredAuthorities">F_DATAVALUE_ADD,F_DATAVALUE_UPDATE,F_DATAVALUE_DELETE</param>
- </action>
-
- <action name="saveComment" class="org.hisp.dhis.de.action.SaveCommentAction">
- <result name="success" type="velocity-json">/dhis-web-dataentry/status.vm</result>
- <param name="onExceptionReturn">plainTextError</param>
- <param name="requiredAuthorities">F_DATAVALUE_ADD,F_DATAVALUE_UPDATE,F_DATAVALUE_DELETE</param>
- </action>
-
- <action name="saveMinMaxLimits" class="org.hisp.dhis.de.action.SaveMinMaxLimitsAction">
- <result name="success" type="httpheader">
- <param name="status">204</param>
- </result>
- <param name="onExceptionReturn">plainTextError</param>
- <param name="requiredAuthorities">F_DATAELEMENT_MINMAX_ADD,F_DATAELEMENT_MINMAX_UPDATE</param>
- </action>
-
- <action name="removeMinMaxLimits" class="org.hisp.dhis.de.action.RemoveMinMaxLimitsAction">
- <result name="success" type="httpheader">
- <param name="status">204</param>
- </result>
- <param name="onExceptionReturn">plainTextError</param>
- <param name="requiredAuthorities">F_DATAELEMENT_MINMAX_DELETE</param>
- </action>
-
- <action name="viewHistory" class="org.hisp.dhis.de.action.HistoryAction">
- <result name="success" type="velocity">/popup.vm</result>
- <param name="page">/dhis-web-dataentry/history.vm</param>
- <param name="javascripts">javascript/history.js</param>
- </action>
-
- <action name="registerCompleteDataSet" class="org.hisp.dhis.de.action.RegisterCompleteDataSetAction">
- <result name="success" type="velocity-json">../dhis-web-commons/ajax/jsonResponseSuccess.vm</result>
- <result name="input" type="velocity-json">../dhis-web-commons/ajax/jsonResponseInput.vm</result>
- </action>
-
- <action name="undoCompleteDataSet" class="org.hisp.dhis.de.action.UndoCompleteDataSetAction">
- <result name="success" type="velocity-json">../dhis-web-commons/ajax/jsonResponseSuccess.vm</result>
- </action>
-
- <action name="getValidationViolations" class="org.hisp.dhis.de.action.ValidationAction">
- <result name="success" type="velocity-json">../dhis-web-commons/ajax/jsonResponseSuccess.vm</result>
- <result name="input" type="velocity-json">../dhis-web-commons/ajax/jsonResponseInput.vm</result>
- </action>
-
- <action name="validate" class="org.hisp.dhis.de.action.ValidationAction">
- <result name="success" type="velocity">/popup.vm</result>
- <result name="input" type="velocity">/popup.vm</result>
- <param name="page">/dhis-web-dataentry/validationResult.vm</param>
- </action>
-
- <action name="markValueForFollowup" class="org.hisp.dhis.de.action.MarkForFollowupAction">
- <result name="success" type="velocity-json">../dhis-web-commons/ajax/jsonResponseSuccess.vm</result>
- </action>
-
- <action name="getHistoryChart" class="org.hisp.dhis.de.action.GetHistoryChartAction">
- <result name="success" type="chart"></result>
- </action>
-
- </package>
+ <include file="dhis-web-commons.xml" />
+
+ <package name="dhis-web-dataentry" extends="dhis-web-commons" namespace="/dhis-web-dataentry">
+
+ <action name="index" class="org.hisp.dhis.de.action.EmptyAction">
+ <result name="success" type="redirect">displayForm.action</result>
+ </action>
+
+ <action name="displayForm" class="org.hisp.dhis.de.action.LoadOrganisationUnitAction">
+ <interceptor-ref name="organisationUnitTreeStack" />
+ <result name="success" type="velocity">/main.vm</result>
+ <param name="page">/dhis-web-dataentry/select.vm</param>
+ <param name="menu">/dhis-web-dataentry/menu.vm</param>
+ <param name="menuTreeHeight">420</param>
+ <param name="javascripts">../dhis-web-commons/ouwt/ouwt.js,javascript/form.js,javascript/entry.js</param>
+ <param name="stylesheets">style/dhis-web-dataentry.css</param>
+ </action>
+
+ <action name="loadDataSets" class="org.hisp.dhis.de.action.LoadDataSetsAction">
+ <result name="success" type="velocity-json">/dhis-web-dataentry/responseDataSets.vm</result>
+ </action>
+
+ <action name="loadPeriods" class="org.hisp.dhis.de.action.LoadPeriodsAction">
+ <result name="success" type="velocity-json">/dhis-web-dataentry/responsePeriods.vm</result>
+ </action>
+
+ <action name="loadNextPreviousPeriods" class="org.hisp.dhis.de.action.LoadNextPreviousPeriodsAction">
+ <result name="success" type="velocity-json">../dhis-web-commons/ajax/jsonPeriods.vm</result>
+ </action>
+
+ <action name="loadDisplayModes" class="org.hisp.dhis.de.action.LoadDisplayModesAction">
+ <result name="success" type="velocity-json">/dhis-web-dataentry/responseDisplayModes.vm</result>
+ </action>
+
+ <action name="select" class="org.hisp.dhis.de.action.SelectAction">
+ <result name="customform" type="velocity">/dhis-web-dataentry/customForm.vm</result>
+ <result name="sectionform" type="velocity">/dhis-web-dataentry/sectionForm.vm</result>
+ <result name="defaultform" type="velocity">/dhis-web-dataentry/defaultForm.vm</result>
+ <result name="input" type="velocity">/dhis-web-dataentry/responseVoid.vm</result>
+ </action>
+
+ <action name="saveValue" class="org.hisp.dhis.de.action.SaveValueAction">
+ <result name="success" type="velocity-json">/dhis-web-dataentry/status.vm</result>
+ <param name="onExceptionReturn">plainTextError</param>
+ <param name="requiredAuthorities">F_DATAVALUE_ADD,F_DATAVALUE_UPDATE,F_DATAVALUE_DELETE</param>
+ </action>
+
+ <action name="saveComment" class="org.hisp.dhis.de.action.SaveCommentAction">
+ <result name="success" type="velocity-json">/dhis-web-dataentry/status.vm</result>
+ <param name="onExceptionReturn">plainTextError</param>
+ <param name="requiredAuthorities">F_DATAVALUE_ADD,F_DATAVALUE_UPDATE,F_DATAVALUE_DELETE</param>
+ </action>
+
+ <action name="saveMinMaxLimits" class="org.hisp.dhis.de.action.SaveMinMaxLimitsAction">
+ <result name="success" type="httpheader">
+ <param name="status">204</param>
+ </result>
+ <param name="onExceptionReturn">plainTextError</param>
+ <param name="requiredAuthorities">F_DATAELEMENT_MINMAX_ADD,F_DATAELEMENT_MINMAX_UPDATE</param>
+ </action>
+
+ <action name="removeMinMaxLimits" class="org.hisp.dhis.de.action.RemoveMinMaxLimitsAction">
+ <result name="success" type="httpheader">
+ <param name="status">204</param>
+ </result>
+ <param name="onExceptionReturn">plainTextError</param>
+ <param name="requiredAuthorities">F_DATAELEMENT_MINMAX_DELETE</param>
+ </action>
+
+ <action name="viewHistory" class="org.hisp.dhis.de.action.HistoryAction">
+ <result name="success" type="velocity">/popup.vm</result>
+ <param name="page">/dhis-web-dataentry/history.vm</param>
+ <param name="javascripts">javascript/history.js</param>
+ </action>
+
+ <action name="registerCompleteDataSet" class="org.hisp.dhis.de.action.RegisterCompleteDataSetAction">
+ <result name="success" type="velocity-json">../dhis-web-commons/ajax/jsonResponseSuccess.vm</result>
+ <result name="input" type="velocity-json">../dhis-web-commons/ajax/jsonResponseInput.vm</result>
+ </action>
+
+ <action name="undoCompleteDataSet" class="org.hisp.dhis.de.action.UndoCompleteDataSetAction">
+ <result name="success" type="velocity-json">../dhis-web-commons/ajax/jsonResponseSuccess.vm</result>
+ </action>
+
+ <action name="getValidationViolations" class="org.hisp.dhis.de.action.ValidationAction">
+ <result name="success" type="velocity-json">../dhis-web-commons/ajax/jsonResponseSuccess.vm</result>
+ <result name="input" type="velocity-json">../dhis-web-commons/ajax/jsonResponseInput.vm</result>
+ </action>
+
+ <action name="validate" class="org.hisp.dhis.de.action.ValidationAction">
+ <result name="success" type="velocity">/popup.vm</result>
+ <result name="input" type="velocity">/popup.vm</result>
+ <param name="page">/dhis-web-dataentry/validationResult.vm</param>
+ </action>
+
+ <action name="markValueForFollowup" class="org.hisp.dhis.de.action.MarkForFollowupAction">
+ <result name="success" type="velocity-json">../dhis-web-commons/ajax/jsonResponseSuccess.vm</result>
+ </action>
+
+ <action name="getHistoryChart" class="org.hisp.dhis.de.action.GetHistoryChartAction">
+ <result name="success" type="chart"></result>
+ </action>
+
+ </package>
</struts>
=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/entry.js'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/entry.js 2011-06-23 08:19:11 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/entry.js 2011-06-23 08:20:44 +0000
@@ -1,4 +1,3 @@
-
// -----------------------------------------------------------------------------
// Save
// -----------------------------------------------------------------------------
@@ -17,131 +16,140 @@
*/
function updateIndicators()
{
- var entryFieldValues = getEntryFieldValues();
-
- $( 'input[name="indicator"]' ).each( function( index ) {
- var indicatorId = $( this ).attr( 'indicatorid' );
-
- var formula = indicatorFormulas[ indicatorId ];
-
- var expression = generateExpression( formula );
-
- var value = eval( expression );
-
- value = isNaN( value ) ? '-' : Math.round( value );
-
- $( this ).attr( 'value', value );
- } );
+ var entryFieldValues = getEntryFieldValues();
+
+ $( 'input[name="indicator"]' ).each( function( index )
+ {
+ var indicatorId = $( this ).attr( 'indicatorid' );
+
+ var formula = indicatorFormulas[indicatorId];
+
+ var expression = generateExpression( formula );
+
+ var value = eval( expression );
+
+ value = isNaN( value ) ? '-' : Math.round( value );
+
+ $( this ).attr( 'value', value );
+ } );
}
/**
* Returns an associative array with an entry for each entry input field in the
- * form where the key is the input field id and the value is the input field value.
+ * form where the key is the input field id and the value is the input field
+ * value.
*/
function getEntryFieldValues()
{
- var entryFieldValues = new Array();
-
- $( 'input[name="entryfield"]' ).each( function( index ) {
- entryFieldValues[ $( this ).attr( 'id' ) ] = $( this ).attr( 'value' );
- } );
-
- return entryFieldValues;
+ var entryFieldValues = new Array();
+
+ $( 'input[name="entryfield"]' ).each( function( index )
+ {
+ entryFieldValues[$( this ).attr( 'id' )] = $( this ).attr( 'value' );
+ } );
+
+ return entryFieldValues;
}
/**
- * Parses the expression and substitues the operand identifiers with the value of
- * the corresponding input entry field.
+ * Parses the expression and substitues the operand identifiers with the value
+ * of the corresponding input entry field.
*/
function generateExpression( expression )
{
- var matcher = expression.match( FORMULA_PATTERN );
-
- for ( k in matcher )
- {
- var match = matcher[k];
- var operand = match.replace( /[\[\]]/g, '' ); // Remove brackets from expression to simplify extraction of identifiers
-
- var dataElementId = operand.substring( 0, operand.indexOf( SEPARATOR ) );
- var categoryOptionComboId = operand.substring( operand.indexOf( SEPARATOR ) + 1, operand.length );
-
- var entryFieldId = 'value[' + dataElementId + '].value:value[' + categoryOptionComboId + '].value';
- var entryField = document.getElementById( entryFieldId );
-
- var value = entryField && entryField.value ? entryField.value : '0';
-
- expression = expression.replace( match, value ); // TODO signed numbers
- }
-
- return expression;
+ var matcher = expression.match( FORMULA_PATTERN );
+
+ for ( k in matcher )
+ {
+ var match = matcher[k];
+ var operand = match.replace( /[\[\]]/g, '' ); // Remove brackets from
+ // expression to
+ // simplify extraction
+ // of identifiers
+
+ var dataElementId = operand.substring( 0, operand.indexOf( SEPARATOR ) );
+ var categoryOptionComboId = operand.substring( operand.indexOf( SEPARATOR ) + 1, operand.length );
+
+ var entryFieldId = 'value[' + dataElementId + '].value:value[' + categoryOptionComboId + '].value';
+ var entryField = document.getElementById( entryFieldId );
+
+ var value = entryField && entryField.value ? entryField.value : '0';
+
+ expression = expression.replace( match, value ); // TODO signed
+ // numbers
+ }
+
+ return expression;
}
/**
-/* Used by default and section forms.
-*/
+ * /* Used by default and section forms.
+ */
function saveVal( dataElementId, optionComboId )
{
- var dataElementName = document.getElementById( 'value[' + dataElementId + '].name' ).innerHTML;
-
- saveValueInternal( dataElementId, optionComboId, dataElementName, null );
+ var dataElementName = document.getElementById( 'value[' + dataElementId + '].name' ).innerHTML;
+
+ saveValueInternal( dataElementId, optionComboId, dataElementName, null );
}
/**
-/* Used by custom forms.
-*/
+ * /* Used by custom forms.
+ */
function saveValue( dataElementId, optionComboId, dataElementName )
{
- saveValueInternal( dataElementId, optionComboId, dataElementName );
- updateIndicators();
+ saveValueInternal( dataElementId, optionComboId, dataElementName );
+ updateIndicators();
}
function saveValueInternal( dataElementId, optionComboId, dataElementName )
{
- var field = document.getElementById( 'value[' + dataElementId + '].value' + ':' + 'value[' + optionComboId + '].value');
+ var field = document.getElementById( 'value[' + dataElementId + '].value' + ':' + 'value[' + optionComboId
+ + '].value' );
var type = document.getElementById( 'value[' + dataElementId + '].type' ).innerHTML;
- var organisationUnitId = getFieldValue( 'organisationUnitId' );
-
+ var organisationUnitId = getFieldValue( 'organisationUnitId' );
+
field.style.backgroundColor = COLOR_YELLOW;
-
+
if ( field.value && field.value != '' )
{
if ( type == 'int' || type == 'number' || type == 'positiveNumber' || type == 'negativeNumber' )
{
- if ( field.value && field.value.length > 255 )
- {
- window.alert( i18n_value_too_long + '\n\n' + dataElementName );
- return alertField( field );
- }
- if ( type == 'int' && !isInt( field.value ) )
- {
- window.alert( i18n_value_must_integer + '\n\n' + dataElementName );
+ if ( field.value && field.value.length > 255 )
+ {
+ window.alert( i18n_value_too_long + '\n\n' + dataElementName );
+ return alertField( field );
+ }
+ if ( type == 'int' && !isInt( field.value ) )
+ {
+ window.alert( i18n_value_must_integer + '\n\n' + dataElementName );
return alertField( field );
}
if ( type == 'number' && !isRealNumber( field.value ) )
{
window.alert( i18n_value_must_number + '\n\n' + dataElementName );
return alertField( field );
- }
- if ( type == 'positiveNumber' && !isPositiveInt( field.value ) )
+ }
+ if ( type == 'positiveNumber' && !isPositiveInt( field.value ) )
{
window.alert( i18n_value_must_positive_integer + '\n\n' + dataElementName );
return alertField( field );
- }
- if ( type == 'negativeNumber' && !isNegativeInt( field.value ) )
+ }
+ if ( type == 'negativeNumber' && !isNegativeInt( field.value ) )
{
window.alert( i18n_value_must_negative_integer + '\n\n' + dataElementName );
return alertField( field );
}
- if ( isValidZeroNumber( field.value ) )
+ if ( isValidZeroNumber( field.value ) )
{
- // If value is 0 and zero is not significant for data element, then skip value
- if ( significantZeros.indexOf( dataElementId ) == -1 )
- {
- field.style.backgroundColor = COLOR_GREEN;
- return false;
- }
+ // If value is 0 and zero is not significant for data element,
+ // then skip value
+ if ( significantZeros.indexOf( dataElementId ) == -1 )
+ {
+ field.style.backgroundColor = COLOR_GREEN;
+ return false;
+ }
}
-
+
var minString = document.getElementById( 'value[' + dataElementId + ':' + optionComboId + '].min' ).innerHTML;
var maxString = document.getElementById( 'value[' + dataElementId + ':' + optionComboId + '].max' ).innerHTML;
@@ -153,24 +161,26 @@
if ( value < min )
{
- var valueSaver = new ValueSaver( dataElementId, optionComboId, organisationUnitId, field.value, COLOR_ORANGE );
+ var valueSaver = new ValueSaver( dataElementId, optionComboId, organisationUnitId, field.value,
+ COLOR_ORANGE );
valueSaver.save();
-
+
window.alert( i18n_value_of_data_element_less + '\n\n' + dataElementName );
-
+
return;
}
if ( value > max )
{
- var valueSaver = new ValueSaver( dataElementId, optionComboId, organisationUnitId, field.value, COLOR_ORANGE );
+ var valueSaver = new ValueSaver( dataElementId, optionComboId, organisationUnitId, field.value,
+ COLOR_ORANGE );
valueSaver.save();
-
- window.alert( i18n_value_of_data_element_greater + '\n\n' + dataElementName);
-
+
+ window.alert( i18n_value_of_data_element_greater + '\n\n' + dataElementName );
+
return;
}
- }
+ }
}
}
@@ -178,38 +188,39 @@
valueSaver.save();
}
-function saveBoolean( dataElementId, optionComboId, selectedOption )
-{
- var select = selectedOption.options[selectedOption.selectedIndex].value
- var organisationUnitId = getFieldValue( 'organisationUnitId' );
-
- selectedOption.style.backgroundColor = COLOR_YELLOW;
-
- var valueSaver = new ValueSaver( dataElementId, optionComboId, organisationUnitId, select, COLOR_GREEN, selectedOption );
+function saveBoolean( dataElementId, optionComboId, selectedOption )
+{
+ var select = selectedOption.options[selectedOption.selectedIndex].value
+ var organisationUnitId = getFieldValue( 'organisationUnitId' );
+
+ selectedOption.style.backgroundColor = COLOR_YELLOW;
+
+ var valueSaver = new ValueSaver( dataElementId, optionComboId, organisationUnitId, select, COLOR_GREEN,
+ selectedOption );
valueSaver.save();
}
function saveDate( dataElementId, dataElementName )
{
- var field = document.getElementById( 'value[' + dataElementId + '].date' );
+ var field = document.getElementById( 'value[' + dataElementId + '].date' );
var type = document.getElementById( 'value[' + dataElementId + '].valueType' ).innerHTML;
- var organisationUnitId = getFieldValue( 'organisationUnitId' );
-
+ var organisationUnitId = getFieldValue( 'organisationUnitId' );
+
field.style.backgroundColor = COLOR_YELLOW;
-
+
var valueSaver = new ValueSaver( dataElementId, '', organisationUnitId, field.value, COLOR_GREEN, '' );
valueSaver.save();
}
function saveComment( dataElementId, optionComboId, commentValue )
{
- var field = document.getElementById( 'value[' + dataElementId + ':' + optionComboId + '].comment' );
+ var field = document.getElementById( 'value[' + dataElementId + ':' + optionComboId + '].comment' );
var select = document.getElementById( 'value[' + dataElementId + ':' + optionComboId + '].comments' );
- var organisationUnitId = getFieldValue( 'organisationUnitId' );
-
+ var organisationUnitId = getFieldValue( 'organisationUnitId' );
+
field.style.backgroundColor = COLOR_YELLOW;
select.style.backgroundColor = COLOR_YELLOW;
-
+
var commentSaver = new CommentSaver( dataElementId, optionComboId, organisationUnitId, commentValue );
commentSaver.save();
}
@@ -219,7 +230,7 @@
*/
function alertField( field )
{
- field.style.backgroundColor = COLOR_YELLOW;
+ field.style.backgroundColor = COLOR_YELLOW;
field.select();
field.focus();
return false;
@@ -237,56 +248,58 @@
var resultColor = resultColor_;
var selectedOption = selectedOption_;
var organisationUnitId = organisationUnitId_;
-
+
this.save = function()
{
- var url = 'saveValue.action?organisationUnitId=' + organisationUnitId + '&dataElementId=' +
- dataElementId + '&optionComboId=' + optionComboId + '&value=' + value;
-
- $.ajax( { url: url, dataType: 'json', success: handleResponse, error: handleError } );
+ var url = 'saveValue.action?organisationUnitId=' + organisationUnitId + '&dataElementId=' + dataElementId
+ + '&optionComboId=' + optionComboId + '&value=' + value;
+
+ $.ajax( {
+ url : url,
+ dataType : 'json',
+ success : handleResponse,
+ error : handleError
+ } );
};
-
+
function handleResponse( json )
{
var code = json.code;
-
+
if ( code == 0 )
{
markValue( resultColor );
- }
- else
+ } else
{
markValue( COLOR_RED );
window.alert( i18n_saving_value_failed_status_code + '\n\n' + code );
}
}
-
+
function handleError( jqXHR, textStatus, errorThrown )
{
markValue( COLOR_RED );
window.alert( i18n_saving_value_failed_status_code + '\n\n' + textStatus );
- }
-
+ }
+
function markValue( color )
{
var type = document.getElementById( 'value[' + dataElementId + '].type' ).innerText;
var element;
-
+
if ( type == 'bool' )
{
element = document.getElementById( 'value[' + dataElementId + '].boolean' );
- }
- else if ( type == 'date' )
- {
- element = document.getElementById( 'value[' + dataElementId + '].date' );
- }
- else if ( selectedOption )
- {
- element = selectedOption;
- }
- else
- {
- element = document.getElementById( 'value[' + dataElementId + '].value' + ':' + 'value[' + optionComboId + '].value');
+ } else if ( type == 'date' )
+ {
+ element = document.getElementById( 'value[' + dataElementId + '].date' );
+ } else if ( selectedOption )
+ {
+ element = selectedOption;
+ } else
+ {
+ element = document.getElementById( 'value[' + dataElementId + '].value' + ':' + 'value[' + optionComboId
+ + '].value' );
}
element.style.backgroundColor = color;
