dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #08636
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 2107: Applied patch from Tri, replaces old calendar widget with the new jquery one
------------------------------------------------------------
revno: 2107
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2010-11-19 10:27:17 +0100
message:
Applied patch from Tri, replaces old calendar widget with the new jquery one
removed:
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/calendar/
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/calendar/calendar-lang.js
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/calendar/calendar-setup.js
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/calendar/calendar.js
modified:
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/CustomDataEntryAction.java
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/screen/DataEntryScreenManager.java
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/screen/DefaultDataEntryScreenManager.java
dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryForm.vm
dhis-2/dhis-web/dhis-web-importexport/src/main/resources/struts.xml
dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/importForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addExtendedDataElementForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addExtendedIndicatorForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateExtendedDataElementForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateExtendedIndicatorForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/struts.xml
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/underAgeForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updatePatientAttributeValueForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/viewDataEntryForm.vm
--
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-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/CustomDataEntryAction.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/CustomDataEntryAction.java 2010-08-31 14:34:31 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/CustomDataEntryAction.java 2010-11-19 09:27:17 +0000
@@ -58,6 +58,7 @@
import org.hisp.dhis.program.ProgramInstanceService;
import org.hisp.dhis.program.ProgramService;
import org.hisp.dhis.program.ProgramStage;
+import org.hisp.dhis.program.ProgramStageDataElement;
import org.hisp.dhis.program.ProgramStageInstance;
import org.hisp.dhis.program.ProgramStageInstanceService;
import org.hisp.dhis.program.ProgramStageService;
@@ -174,6 +175,13 @@
return zeroValueSaveMode;
}
+ private Collection<ProgramStageDataElement> programStageDataElements;
+
+ public Collection<ProgramStageDataElement> getProgramStageDataElements()
+ {
+ return programStageDataElements;
+ }
+
// -------------------------------------------------------------------------
// Input / Output
// -------------------------------------------------------------------------
@@ -307,12 +315,12 @@
{
this.useDefaultForm = useDefaultForm;
}
-
+
public ProgramStageInstance programStageInstance;
-
+
public int getProgramStageInstanceId()
{
- return programStageInstance.getId();
+ return programStageInstance.getId();
}
// -------------------------------------------------------------------------
@@ -322,8 +330,7 @@
public String execute()
throws Exception
{
-
-
+
Boolean zeroValueSaveMode = (Boolean) systemSettingManager.getSystemSetting( KEY_ZERO_VALUE_SAVE_MODE, false );
// ---------------------------------------------------------------------
@@ -365,17 +372,16 @@
return SUCCESS;
}
- programStageInstance = programStageInstanceService.getProgramStageInstance(
- programInstance, programStage );
+ programStageInstance = programStageInstanceService.getProgramStageInstance( programInstance, programStage );
if ( programStageInstance == null )
{
return SUCCESS;
}
- Collection<PatientDataValue> patientDataValues = patientDataValueService.getPatientDataValues(
- programStageInstance );
-
+ Collection<PatientDataValue> patientDataValues = patientDataValueService
+ .getPatientDataValues( programStageInstance );
+
dataEntryForm = programStage.getDataEntryForm();
if ( dataEntryForm == null )
{
@@ -395,6 +401,8 @@
customDataEntryFormCode = dataEntryScreenManager.populateCustomDataEntryScreenForMultiDimensional(
dataEntryForm.getHtmlCode(), patientDataValues, calculatedValueMap, minMaxMap, disabled,
zeroValueSaveMode, i18n, programStage, programStageInstance, organisationUnit );
+
+ //programStageDataElements = dataEntryScreenManager.getProgramStageDataElements( dataEntryForm.getHtmlCode() );
}
return SUCCESS;
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/screen/DataEntryScreenManager.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/screen/DataEntryScreenManager.java 2010-04-12 21:23:33 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/screen/DataEntryScreenManager.java 2010-11-19 09:27:17 +0000
@@ -36,6 +36,7 @@
import org.hisp.dhis.organisationunit.OrganisationUnit;
import org.hisp.dhis.patientdatavalue.PatientDataValue;
import org.hisp.dhis.program.ProgramStage;
+import org.hisp.dhis.program.ProgramStageDataElement;
import org.hisp.dhis.program.ProgramStageInstance;
/**
@@ -61,5 +62,7 @@
Map<CalculatedDataElement, Integer> calculatedValueMap, Map<Integer, MinMaxDataElement> minMaxMap, String disabled,
Boolean saveMode, I18n i18n, ProgramStage programStage, ProgramStageInstance programStageInstance, OrganisationUnit organisationUnit);
+
+ Collection<ProgramStageDataElement> getProgramStageDataElements( String htmlCode );
}
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/screen/DefaultDataEntryScreenManager.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/screen/DefaultDataEntryScreenManager.java 2010-10-28 09:17:13 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/screen/DefaultDataEntryScreenManager.java 2010-11-19 09:27:17 +0000
@@ -32,6 +32,7 @@
import java.util.HashSet;
import java.util.Iterator;
import java.util.Map;
+import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -69,15 +70,15 @@
private static final String MULTI_DIMENSIONAL_FORM = "multidimensionalform";
private static final String EMPTY = "";
-
+
private static final String UNKNOW_CLINIC = "unknow_clinic";
-
+
private static final String NOTAVAILABLE = "not_available";
-
+
// -------------------------------------------------------------------------
// Dependencies
// -------------------------------------------------------------------------
-
+
private PatientDataValueService patientDataValueService;
public void setPatientDataValueService( PatientDataValueService patientDataValueService )
@@ -107,20 +108,19 @@
}
private ProgramStageDataElementService programStageDataElementService;
-
- public void setProgramStageDataElementService(
- ProgramStageDataElementService programStageDataElementService )
+
+ public void setProgramStageDataElementService( ProgramStageDataElementService programStageDataElementService )
{
this.programStageDataElementService = programStageDataElementService;
}
-
+
// -------------------------------------------------------------------------
// DataEntryScreenManager implementation
// -------------------------------------------------------------------------
public boolean hasMixOfDimensions( ProgramStage programStage )
{
Collection<DataElement> dataElements = programStageDataElementService.getListDataElement( programStage );
- if (dataElements.size() > 0 )
+ if ( dataElements.size() > 0 )
{
Iterator<DataElement> dataElementIterator = dataElements.iterator();
@@ -141,8 +141,8 @@
public boolean hasMultiDimensionalDataElement( ProgramStage programStage )
{
Collection<DataElement> dataElements = programStageDataElementService.getListDataElement( programStage );
-
- for ( DataElement element :dataElements )
+
+ for ( DataElement element : dataElements )
{
if ( element.isMultiDimensional() )
{
@@ -161,9 +161,9 @@
public Collection<Integer> getAllCalculatedDataElements( ProgramStage programStage )
{
Collection<Integer> calculatedDataElementIds = new HashSet<Integer>();
-
+
Collection<DataElement> dataElements = programStageDataElementService.getListDataElement( programStage );
-
+
CalculatedDataElement cde;
for ( DataElement dataElement : dataElements )
@@ -185,7 +185,7 @@
Map<CalculatedDataElement, Map<DataElement, Integer>> calculatedDataElementMap = new HashMap<CalculatedDataElement, Map<DataElement, Integer>>();
Collection<DataElement> dataElements = programStageDataElementService.getListDataElement( programStage );
-
+
CalculatedDataElement cde;
for ( DataElement dataElement : dataElements )
@@ -287,14 +287,15 @@
i18n, programStage, programStageInstance, organisationUnit, mapDataValue );
result = populateI18nStrings( result, i18n );
-
+
return result;
}
private String populateCustomDataEntryForTextBox( String dataEntryFormCode,
Collection<PatientDataValue> dataValues, Map<CalculatedDataElement, Integer> calculatedValueMap,
- String disabled, Boolean saveMode, I18n i18n, ProgramStage programStage, ProgramStageInstance programStageInstance,
- OrganisationUnit organisationUnit, Map<Integer, Collection<PatientDataValue>> mapDataValue )
+ String disabled, Boolean saveMode, I18n i18n, ProgramStage programStage,
+ ProgramStageInstance programStageInstance, OrganisationUnit organisationUnit,
+ Map<Integer, Collection<PatientDataValue>> mapDataValue )
{
// ---------------------------------------------------------------------
// Inline Javascript to add to HTML before outputting
@@ -335,8 +336,7 @@
// ---------------------------------------------------------------------
Map<Integer, DataElement> dataElementMap = getDataElementMap( programStage );
-
-
+
while ( dataElementMatcher.find() )
{
// -----------------------------------------------------------------
@@ -357,28 +357,28 @@
int programStageId = Integer.parseInt( identifierMatcher.group( 1 ) );
int dataElementId = Integer.parseInt( identifierMatcher.group( 2 ) );
-
+
int optionComboId = Integer.parseInt( identifierMatcher.group( 3 ) );
DataElement dataElement = null;
-
+
String programStageName = programStage.getName();
-
+
if ( programStageId != programStage.getId() )
{
dataElement = dataElementService.getDataElement( dataElementId );
-
+
ProgramStage otherProgramStage = programStageService.getProgramStage( programStageId );
programStageName = otherProgramStage != null ? otherProgramStage.getName() : "N/A";
-
+
}
else
{
dataElement = dataElementMap.get( dataElementId );
ProgramStageDataElement psde = programStageDataElementService.get( programStage, dataElement );
- compulsory = BooleanUtils.toStringTrueFalse( psde.isCompulsory());
+ compulsory = BooleanUtils.toStringTrueFalse( psde.isCompulsory() );
}
-
+
if ( dataElement == null )
{
continue;
@@ -411,13 +411,12 @@
ProgramStage otherProgramStage = programStageService.getProgramStage( programStageId );
ProgramStageInstance otherProgramStageInstance = programStageInstanceService
.getProgramStageInstance( programStageInstance.getProgramInstance(), otherProgramStage );
- patientDataValues = patientDataValueService.getPatientDataValues(
- otherProgramStageInstance );
+ patientDataValues = patientDataValueService.getPatientDataValues( otherProgramStageInstance );
mapDataValue.put( programStageId, patientDataValues );
}
- patientDataValue = getValue( patientDataValues, dataElementId , optionComboId );
-// logger.info( "patientDataValue: " + patientDataValue );
+ patientDataValue = getValue( patientDataValues, dataElementId, optionComboId );
+ // logger.info( "patientDataValue: " + patientDataValue );
dataElementValue = patientDataValue != null ? patientDataValue.getValue() : dataElementValue;
}
else
@@ -494,44 +493,48 @@
// disable
// If programStagsInstance is completed then disabled it
// -----------------------------------------------------------
-
+
disabled = "";
- if( programStageId == programStage.getId() && !programStageInstance.isCompleted())
+ if ( programStageId == programStage.getId() && !programStageInstance.isCompleted() )
{
// -----------------------------------------------------------
// Add ProvidedByOtherFacility checkbox
// -----------------------------------------------------------
appendCode = addProvidedByOtherFacilityCheckbox( appendCode, patientDataValue );
- }else {
- disabled = "disabled=\"\"";
- }
-
+ }
+ else
+ {
+ disabled = "disabled=\"\"";
+ }
+
// -----------------------------------------------------------
//
// -----------------------------------------------------------
- String orgUnitName = i18n.getString(NOTAVAILABLE);
- if( patientDataValue != null )
+ String orgUnitName = i18n.getString( NOTAVAILABLE );
+ if ( patientDataValue != null )
{
- if( patientDataValue.isProvidedByAnotherFacility() )
- {
- orgUnitName = i18n.getString(UNKNOW_CLINIC);
- }else {
+ if ( patientDataValue.isProvidedByAnotherFacility() )
+ {
+ orgUnitName = i18n.getString( UNKNOW_CLINIC );
+ }
+ else
+ {
orgUnitName = patientDataValue.getOrganisationUnit().getName();
}
}
-
+
appendCode = appendCode.replace( "$DATAELEMENTID", String.valueOf( dataElementId ) );
appendCode = appendCode.replace( "$PROGRAMSTAGEID", String.valueOf( programStageId ) );
appendCode = appendCode.replace( "$PROGRAMSTAGENAME", programStageName );
- appendCode = appendCode.replace( "$ORGUNITNAME", orgUnitName );
- appendCode = appendCode.replace( "$OPTIONCOMBOID", String.valueOf( optionComboId ));
+ appendCode = appendCode.replace( "$ORGUNITNAME", orgUnitName );
+ appendCode = appendCode.replace( "$OPTIONCOMBOID", String.valueOf( optionComboId ) );
appendCode = appendCode.replace( "$DATAELEMENTNAME", dataElement.getName() );
appendCode = appendCode.replace( "$DATAELEMENTTYPE", dataElementType );
appendCode = appendCode.replace( "$DISABLED", disabled );
- appendCode = appendCode.replace( "$COMPULSORY", compulsory );
+ appendCode = appendCode.replace( "$COMPULSORY", compulsory );
appendCode = appendCode.replace( "$SAVEMODE", "" + saveMode + "" );
-// logger.info( "after add js : " + appendCode );
+ // logger.info( "after add js : " + appendCode );
dataElementMatcher.appendReplacement( sb, appendCode );
}
@@ -585,13 +588,12 @@
Map<Integer, DataElement> dataElementMap = getDataElementMap( programStage );
-
while ( dataElementMatcher.find() )
{
// -----------------------------------------------------------------
// Get HTML input field code
// -----------------------------------------------------------------
- String compulsory = "null";
+ String compulsory = "null";
String dataElementCode = dataElementMatcher.group( 1 );
Matcher identifierMatcher = identifierPattern.matcher( dataElementCode );
if ( identifierMatcher.find() && identifierMatcher.groupCount() > 0 )
@@ -601,18 +603,17 @@
// -------------------------------------------------------------
int programStageId = Integer.parseInt( identifierMatcher.group( 1 ) );
-// logger.info( "programStageId: " + programStageId );
+ // logger.info( "programStageId: " + programStageId );
int dataElementId = Integer.parseInt( identifierMatcher.group( 2 ) );
DataElement dataElement = null;
String programStageName = programStage.getName();
-
if ( programStageId != programStage.getId() )
{
dataElement = dataElementService.getDataElement( dataElementId );
-
+
ProgramStage otherProgramStage = programStageService.getProgramStage( programStageId );
programStageName = otherProgramStage != null ? otherProgramStage.getName() : "N/A";
}
@@ -620,7 +621,7 @@
{
dataElement = dataElementMap.get( dataElementId );
ProgramStageDataElement psde = programStageDataElementService.get( programStage, dataElement );
- compulsory = BooleanUtils.toStringTrueFalse( psde.isCompulsory());
+ compulsory = BooleanUtils.toStringTrueFalse( psde.isCompulsory() );
}
if ( dataElement == null )
@@ -655,13 +656,12 @@
ProgramStage otherProgramStage = programStageService.getProgramStage( programStageId );
ProgramStageInstance otherProgramStageInstance = programStageInstanceService
.getProgramStageInstance( programStageInstance.getProgramInstance(), otherProgramStage );
- patientDataValues = patientDataValueService.getPatientDataValues(
- otherProgramStageInstance );
+ patientDataValues = patientDataValueService.getPatientDataValues( otherProgramStageInstance );
mapDataValue.put( programStageId, patientDataValues );
}
patientDataValue = getValue( patientDataValues, dataElementId );
-// logger.info( "patientDataValue: " + patientDataValue );
+ // logger.info( "patientDataValue: " + patientDataValue );
dataElementValue = patientDataValue != null ? patientDataValue.getValue() : dataElementValue;
}
else
@@ -698,19 +698,19 @@
// -------------------------------------------------------------
if ( patientDataValue != null )
{
-
+
if ( dataElementValue.equalsIgnoreCase( "true" ) )
{
appendCode = appendCode.replace( "<option value=\"true\">", "<option value=\""
+ i18n.getString( "true" ) + "\" selected>" );
}
-
+
if ( dataElementValue.equalsIgnoreCase( "false" ) )
{
appendCode = appendCode.replace( "<option value=\"false\">", "<option value=\""
+ i18n.getString( "false" ) + "\" selected>" );
}
-
+
}
appendCode += "</select>";
@@ -759,48 +759,51 @@
// disable
// If programStagsInstance is completed then disabled it
// -----------------------------------------------------------
-
-// System.out.println("programStageInstance.isCompleted() : "+programStageInstance.isCompleted() +"id: "+programStageInstance.getId());
+
+ // System.out.println("programStageInstance.isCompleted() : "+programStageInstance.isCompleted()
+ // +"id: "+programStageInstance.getId());
disabled = "";
if ( programStageId != programStage.getId() || programStageInstance.isCompleted() )
{
disabled = "disabled";
}
- else
+ else
{
// -----------------------------------------------------------
// Add ProvidedByOtherFacility checkbox
// -----------------------------------------------------------
appendCode = addProvidedByOtherFacilityCheckbox( appendCode, patientDataValue );
}
-
+
// -----------------------------------------------------------
//
// -----------------------------------------------------------
- String orgUnitName = i18n.getString(NOTAVAILABLE);
- if( patientDataValue != null )
+ String orgUnitName = i18n.getString( NOTAVAILABLE );
+ if ( patientDataValue != null )
{
- if( patientDataValue.isProvidedByAnotherFacility() )
- {
- orgUnitName = i18n.getString(UNKNOW_CLINIC);
- }else {
+ if ( patientDataValue.isProvidedByAnotherFacility() )
+ {
+ orgUnitName = i18n.getString( UNKNOW_CLINIC );
+ }
+ else
+ {
orgUnitName = patientDataValue.getOrganisationUnit().getName();
}
}
appendCode = appendCode.replace( "$DATAELEMENTID", String.valueOf( dataElementId ) );
appendCode = appendCode.replace( "$PROGRAMSTAGEID", String.valueOf( programStageId ) );
- appendCode = appendCode.replace( "$PROGRAMSTAGENAME", programStageName );
- appendCode = appendCode.replace( "$ORGUNITNAME", orgUnitName );
+ appendCode = appendCode.replace( "$PROGRAMSTAGENAME", programStageName );
+ appendCode = appendCode.replace( "$ORGUNITNAME", orgUnitName );
appendCode = appendCode.replace( "$DATAELEMENTNAME", dataElement.getName() );
appendCode = appendCode.replace( "$DATAELEMENTTYPE", dataElementType );
appendCode = appendCode.replace( "$DISABLED", disabled );
- appendCode = appendCode.replace( "$COMPULSORY", compulsory );
+ appendCode = appendCode.replace( "$COMPULSORY", compulsory );
appendCode = appendCode.replace( "i18n_yes", i18n.getString( "yes" ) );
appendCode = appendCode.replace( "i18n_no", i18n.getString( "no" ) );
appendCode = appendCode.replace( "i18n_select_value", i18n.getString( "select_value" ) );
appendCode = appendCode.replace( "$SAVEMODE", "" + saveMode + "" );
-
+
appendCode = appendCode.replaceAll( "\\$", "\\\\\\$" );
dataElementMatcher.appendReplacement( sb, appendCode );
@@ -855,9 +858,7 @@
// ---------------------------------------------------------------------
Map<Integer, DataElement> dataElementMap = getDataElementMap( programStage );
-
-
-
+
while ( dataElementMatcher.find() )
{
// -----------------------------------------------------------------
@@ -865,13 +866,13 @@
// -----------------------------------------------------------------
String dataElementCode = dataElementMatcher.group( 1 );
-
-// System.out.println("boolean dataElementCode : "+dataElementCode);
-
+
+ // System.out.println("boolean dataElementCode : "+dataElementCode);
+
Matcher identifierMatcher = identifierPattern.matcher( dataElementCode );
-
+
String compulsory = "null";
-
+
if ( identifierMatcher.find() && identifierMatcher.groupCount() > 0 )
{
@@ -885,19 +886,18 @@
String programStageName = programStage.getName();
-
if ( programStageId != programStage.getId() )
{
dataElement = dataElementService.getDataElement( dataElementId );
-
+
ProgramStage otherProgramStage = programStageService.getProgramStage( programStageId );
programStageName = otherProgramStage != null ? otherProgramStage.getName() : "N/A";
}
else
{
- dataElement = dataElementMap.get( dataElementId );
+ dataElement = dataElementMap.get( dataElementId );
ProgramStageDataElement psde = programStageDataElementService.get( programStage, dataElement );
- compulsory = BooleanUtils.toStringTrueFalse( psde.isCompulsory());
+ compulsory = BooleanUtils.toStringTrueFalse( psde.isCompulsory() );
}
if ( dataElement == null )
@@ -928,13 +928,12 @@
ProgramStage otherProgramStage = programStageService.getProgramStage( programStageId );
ProgramStageInstance otherProgramStageInstance = programStageInstanceService
.getProgramStageInstance( programStageInstance.getProgramInstance(), otherProgramStage );
- patientDataValues = patientDataValueService.getPatientDataValues(
- otherProgramStageInstance );
+ patientDataValues = patientDataValueService.getPatientDataValues( otherProgramStageInstance );
mapDataValue.put( programStageId, patientDataValues );
}
patientDataValue = getValue( patientDataValues, dataElementId );
-// logger.info( "patientDataValue: " + patientDataValue );
+ // logger.info( "patientDataValue: " + patientDataValue );
dataElementValue = patientDataValue != null ? patientDataValue.getValue() : dataElementValue;
}
else
@@ -968,11 +967,15 @@
// -------------------------------------------------------------
// Insert value of data element in output code
// -------------------------------------------------------------
- if( patientDataValue != null )
+ if ( patientDataValue != null )
{
-// System.out.println("optioncomboId: "+patientDataValue.getOptionCombo().getId() + " ===name: "+ patientDataValue.getOptionCombo().getName());
- appendCode = appendCode.replace( "id=\"combo["+patientDataValue.getOptionCombo().getId()+"].combo\"", "id=\"combo["+patientDataValue.getOptionCombo().getId()+"].combo\" selected=\"selected\"");
-// System.out.println("appendCode: "+appendCode);
+ // System.out.println("optioncomboId: "+patientDataValue.getOptionCombo().getId()
+ // + " ===name: "+
+ // patientDataValue.getOptionCombo().getName());
+ appendCode = appendCode.replace( "id=\"combo[" + patientDataValue.getOptionCombo().getId()
+ + "].combo\"", "id=\"combo[" + patientDataValue.getOptionCombo().getId()
+ + "].combo\" selected=\"selected\"" );
+ // System.out.println("appendCode: "+appendCode);
}
appendCode += "</select>";
@@ -1037,25 +1040,27 @@
// -----------------------------------------------------------
//
// -----------------------------------------------------------
- String orgUnitName = i18n.getString(NOTAVAILABLE);
- if( patientDataValue != null )
+ String orgUnitName = i18n.getString( NOTAVAILABLE );
+ if ( patientDataValue != null )
{
- if( patientDataValue.isProvidedByAnotherFacility() )
- {
- orgUnitName = i18n.getString(UNKNOW_CLINIC);
- }else {
+ if ( patientDataValue.isProvidedByAnotherFacility() )
+ {
+ orgUnitName = i18n.getString( UNKNOW_CLINIC );
+ }
+ else
+ {
orgUnitName = patientDataValue.getOrganisationUnit().getName();
}
}
-
+
appendCode = appendCode.replace( "$DATAELEMENTID", String.valueOf( dataElementId ) );
appendCode = appendCode.replace( "$PROGRAMSTAGEID", String.valueOf( programStageId ) );
appendCode = appendCode.replace( "$PROGRAMSTAGENAME", programStageName );
- appendCode = appendCode.replace( "$ORGUNITNAME", orgUnitName );
+ appendCode = appendCode.replace( "$ORGUNITNAME", orgUnitName );
appendCode = appendCode.replace( "$DATAELEMENTNAME", dataElement.getName() );
appendCode = appendCode.replace( "$DATAELEMENTTYPE", dataElementType );
appendCode = appendCode.replace( "$DISABLED", disabled );
- appendCode = appendCode.replace( "$COMPULSORY", compulsory );
+ appendCode = appendCode.replace( "$COMPULSORY", compulsory );
appendCode = appendCode.replace( "i18n_select_value", i18n.getString( "select_value" ) );
appendCode = appendCode.replace( "$SAVEMODE", "" + saveMode + "" );
appendCode = appendCode.replaceAll( "\\$", "\\\\\\$" );
@@ -1069,8 +1074,6 @@
return sb.toString();
}
-
-
private String populateCustomDataEntryForDate( String dataEntryFormCode, Collection<PatientDataValue> dataValues,
Map<CalculatedDataElement, Integer> calculatedValueMap, Map<Integer, MinMaxDataElement> minMaxMap,
String disabled, Boolean saveMode, I18n i18n, ProgramStage programStage,
@@ -1085,11 +1088,17 @@
final String jsCodeForDate = " name=\"entryfield\" $DISABLED onchange=\"saveDateCustom( this )\" data=\"{compulsory:$COMPULSORY, dataElementId:$DATAELEMENTID, dataElementName:'$DATAELEMENTNAME', dataElementType:'$DATAELEMENTTYPE', programStageId:$PROGRAMSTAGEID, programStageName: '$PROGRAMSTAGENAME', orgUnitName:'$ORGUNITNAME'}\"";
// final String historyCode =
// " ondblclick='javascript:viewHistory( $DATAELEMENTID, $OPTIONCOMBOID, true )' ";
- //final String calDataElementCode = " class=\"calculated\" disabled ";
-
+ // final String calDataElementCode = " class=\"calculated\" disabled ";
+
+
+
// ---------------------------------------------------------------------
// Metadata code to add to HTML before outputting
- // ---------------------------------------------------------------------
+ // ---------------------------------------------------------------------
+
+ final String jQueryCalendar = "<script> jQuery(function(){" +
+ "setupDataEntryCalendar(\"value\\\\\\\\[$PROGRAMSTAGEID\\\\\\\\]\\\\\\\\.date\\\\\\\\:value\\\\\\\\[$DATAELEMENTID\\\\\\\\]\\\\\\\\.date\")" +
+ "});</script>";
final String metaDataCode = "<span id=\"value[$DATAELEMENTID].name\" style=\"display:none\">$DATAELEMENTNAME</span>"
+ "<span id=\"value[$DATAELEMENTID].type\" style=\"display:none\">$DATAELEMENTTYPE</span>";
@@ -1099,14 +1108,15 @@
// Pattern to match data elements in the HTML code
// ---------------------------------------------------------------------
- Pattern dataElementPattern = Pattern.compile( "(<input.*?)[/]?</script>" );
+ Pattern dataElementPattern = Pattern.compile( "(<input.*?)[/]?/>" );
Matcher dataElementMatcher = dataElementPattern.matcher( dataEntryFormCode );
// ---------------------------------------------------------------------
// Pattern to extract data element ID from data element field
// ---------------------------------------------------------------------
- Pattern identifierPattern = Pattern.compile( "id=\"value\\[([\\p{Digit}.]*)\\].date:value\\[([\\p{Digit}.]*)\\].date\"" );
+ Pattern identifierPattern = Pattern
+ .compile( "id=\"value\\[([\\p{Digit}.]*)\\].date:value\\[([\\p{Digit}.]*)\\].date\"" );
// ---------------------------------------------------------------------
// Iterate through all matching data element fields
@@ -1114,7 +1124,6 @@
Map<Integer, DataElement> dataElementMap = getDataElementMap( programStageInstance.getProgramStage() );
-
while ( dataElementMatcher.find() )
{
// -----------------------------------------------------------------
@@ -1122,8 +1131,8 @@
// -----------------------------------------------------------------
String compulsory = "null";
String dataElementCode = dataElementMatcher.group( 1 );
-// System.out.println("DATE+++++++=====================================================");
-// System.out.println(dataElementCode);
+ // System.out.println("DATE+++++++=====================================================");
+ // System.out.println(dataElementCode);
Matcher identifierMatcher = identifierPattern.matcher( dataElementCode );
if ( identifierMatcher.find() && identifierMatcher.groupCount() > 0 )
@@ -1138,19 +1147,18 @@
String programStageName = programStage.getName();
-
if ( programStageId != programStage.getId() )
{
dataElement = dataElementService.getDataElement( dataElementId );
-
+
ProgramStage otherProgramStage = programStageService.getProgramStage( programStageId );
programStageName = otherProgramStage != null ? otherProgramStage.getName() : "N/A";
}
else
{
- dataElement = dataElementMap.get( dataElementId );
+ dataElement = dataElementMap.get( dataElementId );
ProgramStageDataElement psde = programStageDataElementService.get( programStage, dataElement );
- compulsory = BooleanUtils.toStringTrueFalse( psde.isCompulsory());
+ compulsory = BooleanUtils.toStringTrueFalse( psde.isCompulsory() );
}
if ( dataElement == null )
@@ -1183,13 +1191,12 @@
ProgramStage otherProgramStage = programStageService.getProgramStage( programStageId );
ProgramStageInstance otherProgramStageInstance = programStageInstanceService
.getProgramStageInstance( programStageInstance.getProgramInstance(), otherProgramStage );
- patientDataValues = patientDataValueService.getPatientDataValues(
- otherProgramStageInstance );
+ patientDataValues = patientDataValueService.getPatientDataValues( otherProgramStageInstance );
mapDataValue.put( programStageId, patientDataValues );
}
patientDataValue = getValue( patientDataValues, dataElementId );
-// logger.info( "patientDataValue: " + patientDataValue );
+ // logger.info( "patientDataValue: " + patientDataValue );
dataElementValue = patientDataValue != null ? patientDataValue.getValue() : dataElementValue;
}
else
@@ -1247,7 +1254,7 @@
String appendCode = dataElementCode;
appendCode = appendCode.replace( "name=\"entryfield\"", jsCodeForDate );
- appendCode += "</script>";
+ //appendCode += "</script>";
if ( !dataElement.getAggregationOperator().equalsIgnoreCase( DataElement.AGGREGATION_OPERATOR_SUM ) )
{
@@ -1255,6 +1262,7 @@
}
appendCode += metaDataCode;
+
// -----------------------------------------------------------
// Check if this dataElement is from another programStage then
@@ -1268,34 +1276,40 @@
}
else
{
+ appendCode += jQueryCalendar;
+
// -----------------------------------------------------------
// Add ProvidedByOtherFacility checkbox
// -----------------------------------------------------------
appendCode = addProvidedByOtherFacilityCheckbox( appendCode, patientDataValue );
- }
-
+
+ }
+
+
// -----------------------------------------------------------
// Get Org Unit name
// -----------------------------------------------------------
- String orgUnitName = i18n.getString(NOTAVAILABLE);
- if( patientDataValue != null )
+ String orgUnitName = i18n.getString( NOTAVAILABLE );
+ if ( patientDataValue != null )
{
- if( patientDataValue.isProvidedByAnotherFacility() )
- {
- orgUnitName = i18n.getString(UNKNOW_CLINIC);
- }else {
+ if ( patientDataValue.isProvidedByAnotherFacility() )
+ {
+ orgUnitName = i18n.getString( UNKNOW_CLINIC );
+ }
+ else
+ {
orgUnitName = patientDataValue.getOrganisationUnit().getName();
}
}
appendCode = appendCode.replace( "$DATAELEMENTID", String.valueOf( dataElementId ) );
appendCode = appendCode.replace( "$PROGRAMSTAGEID", String.valueOf( programStageId ) );
- appendCode = appendCode.replace( "$PROGRAMSTAGENAME", programStageName );
- appendCode = appendCode.replace( "$ORGUNITNAME", orgUnitName );
+ appendCode = appendCode.replace( "$PROGRAMSTAGENAME", programStageName );
+ appendCode = appendCode.replace( "$ORGUNITNAME", orgUnitName );
appendCode = appendCode.replace( "$DATAELEMENTNAME", dataElement.getName() );
appendCode = appendCode.replace( "$DATAELEMENTTYPE", dataElementType );
appendCode = appendCode.replace( "$DISABLED", disabled );
- appendCode = appendCode.replace( "$COMPULSORY", compulsory );
+ appendCode = appendCode.replace( "$COMPULSORY", compulsory );
appendCode = appendCode.replace( "$SAVEMODE", "" + saveMode + "" );
appendCode = appendCode.replaceAll( "\\$", "\\\\\\$" );
@@ -1308,7 +1322,6 @@
return sb.toString();
}
-
// -------------------------------------------------------------------------
// Supportive methods
// -------------------------------------------------------------------------
@@ -1359,7 +1372,7 @@
private Map<Integer, DataElement> getDataElementMap( ProgramStage programStage )
{
Collection<DataElement> dataElements = programStageDataElementService.getListDataElement( programStage );
-
+
if ( programStage == null )
{
return null;
@@ -1384,52 +1397,97 @@
private String addProvidedByOtherFacilityCheckbox( String appendCode, PatientDataValue patientDataValue )
{
appendCode += "<label for=\"$PROGRAMSTAGEID_$DATAELEMENTID_facility\" title=\"is provided by another Facility ?\" ></label><input name=\"providedByAnotherFacility\" title=\"is provided by another Facility ?\" id=\"$PROGRAMSTAGEID_$DATAELEMENTID_facility\" type=\"checkbox\" ";
-// appendCoe +="<input name=\"providedByAnotherFacility\" title=\"is provided by another Facility ?\" id=\"$PROGRAMSTAGEID_$DATAELEMENTID_facility\" type=\"checkbox\" ";
+ // appendCoe
+ // +="<input name=\"providedByAnotherFacility\" title=\"is provided by another Facility ?\" id=\"$PROGRAMSTAGEID_$DATAELEMENTID_facility\" type=\"checkbox\" ";
if ( patientDataValue != null && patientDataValue.isProvidedByAnotherFacility() )
{
appendCode += " checked=\"checked\" ";
}
appendCode += "onChange=\"updateProvidingFacilityCustom( $PROGRAMSTAGEID, $DATAELEMENTID, this )\" >";
-
+
return appendCode;
}
private String populateI18nStrings( String dataEntryFormCode, I18n i18n )
{
- StringBuffer sb = new StringBuffer();
-
- // ---------------------------------------------------------------------
- // Pattern to match i18n strings in the HTML code
- // ---------------------------------------------------------------------
-
- //Pattern i18nPattern = Pattern.compile( "(<i18n::.*?)[/]?>", Pattern.DOTALL );
- Pattern i18nPattern = Pattern.compile( "(<i18n.*?)[/]?</i18n>", Pattern.DOTALL );
- Matcher i18nMatcher = i18nPattern.matcher( dataEntryFormCode );
-
- // ---------------------------------------------------------------------
- // Iterate through all matching i18n element fields
- // ---------------------------------------------------------------------
-
- while ( i18nMatcher.find() )
- {
- String i18nCode = i18nMatcher.group( 1 );
-
- i18nCode = i18nCode.replaceAll("<i18n>", "");
-
- i18nCode = i18n.getString( i18nCode );
-
- i18nMatcher.appendReplacement( sb, i18nCode );
- }
-
- i18nMatcher.appendTail( sb );
-
- String result = sb.toString();
-
- result.replaceAll("</i18n>", "");
-
- return result;
+ StringBuffer sb = new StringBuffer();
+
+ // ---------------------------------------------------------------------
+ // Pattern to match i18n strings in the HTML code
+ // ---------------------------------------------------------------------
+
+ // Pattern i18nPattern = Pattern.compile( "(<i18n::.*?)[/]?>",
+ // Pattern.DOTALL );
+ Pattern i18nPattern = Pattern.compile( "(<i18n.*?)[/]?</i18n>", Pattern.DOTALL );
+ Matcher i18nMatcher = i18nPattern.matcher( dataEntryFormCode );
+
+ // ---------------------------------------------------------------------
+ // Iterate through all matching i18n element fields
+ // ---------------------------------------------------------------------
+
+ while ( i18nMatcher.find() )
+ {
+ String i18nCode = i18nMatcher.group( 1 );
+
+ i18nCode = i18nCode.replaceAll( "<i18n>", "" );
+
+ i18nCode = i18n.getString( i18nCode );
+
+ i18nMatcher.appendReplacement( sb, i18nCode );
+ }
+
+ i18nMatcher.appendTail( sb );
+
+ String result = sb.toString();
+
+ result.replaceAll( "</i18n>", "" );
+
+ return result;
+ }
+
+ @Override
+ public Collection<ProgramStageDataElement> getProgramStageDataElements( String htmlCode )
+ {
+
+ Set<ProgramStageDataElement> result = new HashSet<ProgramStageDataElement>();
+
+ Pattern identifierPattern = Pattern
+ .compile( "id=\"value\\[([\\p{Digit}.]*)\\].(value|boolean|combo|date):value\\[([\\p{Digit}.]*)\\].(value|boolean|combo|date)\"" );
+
+ Matcher matcher = identifierPattern.matcher( htmlCode );
+
+ while ( matcher.find() )
+ {
+ String replaceString = matcher.group();
+ replaceString = replaceString.replaceAll( "[\\\"\\=\\.\\[\\]]|value|date|id|combo|boolean", "" );
+
+ Integer programStageId = Integer.parseInt( replaceString.split( ":" )[0] );
+ Integer dataElementId = Integer.parseInt( replaceString.split( ":" )[1] );
+
+ ProgramStage programStage = programStageService.getProgramStage( programStageId );
+
+ if ( programStage == null )
+ {
+ logger.error( "program stage id : " + programStageId + " does not exist" );
+ }
+
+ DataElement dataElement = dataElementService.getDataElement( dataElementId );
+
+ if ( dataElement == null )
+ {
+ logger.error( "data element id : " + programStageId + " does not exist" );
+ }
+
+ ProgramStageDataElement programStageDataElement = programStageDataElementService.get( programStage,
+ dataElement );
+
+ result.add( programStageDataElement );
+
+ }
+
+ return result;
}
}
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml 2010-10-30 10:56:31 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml 2010-11-19 09:27:17 +0000
@@ -85,7 +85,7 @@
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-caseentry/dataEntryForm.vm</param>
<param name="menu">/dhis-web-caseentry/dataEntryMenu.vm</param>
- <param name="javascripts">../dhis-web-commons/ouwt/ouwt.js,javascript/dataEntry.js,../dhis-web-commons/calendar/calendar.js,../dhis-web-commons/calendar/calendar-lang.js,../dhis-web-commons/calendar/calendar-setup.js,../dhis-web-commons/javascripts/jQuery/jquery.metadata.js</param>
+ <param name="javascripts">../dhis-web-commons/ouwt/ouwt.js,javascript/dataEntry.js</param>
<param name="stylesheets">style/patient.css</param>
</action>
@@ -129,10 +129,8 @@
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-caseentry/dataEntryForm.vm</param>
<param name="menu">/dhis-web-caseentry/dataEntryMenu.vm</param>
- <param name="javascripts">../dhis-web-commons/javascripts/jQuery/ui/jquery-ui.js,../dhis-web-commons/ouwt/ouwt.js,javascript/dataEntry.js,../dhis-web-commons/calendar/calendar.js,../dhis-web-commons/calendar/calendar-lang.js,../dhis-web-commons/calendar/calendar-setup.js
- ,../dhis-web-commons/javascripts/jQuery/jquery.metadata.js,javascript/customcheckbox/prettyCheckboxes.js</param>
- <param name="stylesheets">../dhis-web-commons/javascripts/jQuery/ui/css/redmond/jquery-ui.css,style/patient.css
- ,javascript/customcheckbox/prettyCheckboxes.css</param>
+ <param name="javascripts">../dhis-web-commons/ouwt/ouwt.js,javascript/dataEntry.js,javascript/customcheckbox/prettyCheckboxes.js</param>
+ <param name="stylesheets">style/patient.css,javascript/customcheckbox/prettyCheckboxes.css</param>
</action>
<!-- Multi DataEntry -->
@@ -149,21 +147,8 @@
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-caseentry/dataentryRecords.vm</param>
<param name="menu">/dhis-web-caseentry/dataEntryMenu.vm</param>
- <param name="javascripts">
- ../dhis-web-commons/javascripts/jQuery/ui/jquery-ui.js,
- ../dhis-web-commons/calendar/calendar.js,
- ../dhis-web-commons/calendar/calendar-lang.js,
- ../dhis-web-commons/calendar/calendar-setup.js,
- ../dhis-web-commons/javascripts/jQuery/jquery.metadata.js,
- ../dhis-web-commons/ouwt/ouwt.js,javascript/dataEntry.js,
- javascript/customcheckbox/prettyCheckboxes.js
- </param>
- <param name="stylesheets">
- ../dhis-web-commons/jQuery/ui/css/redmond/jquery-ui.css
- ,style/patient.css
- ,javascript/customcheckbox/prettyCheckboxes.css
- ,../dhis-web-commons/paging/paging.css
- </param>
+ <param name="javascripts">../dhis-web-commons/ouwt/ouwt.js,javascript/dataEntry.js,javascript/customcheckbox/prettyCheckboxes.js</param>
+ <param name="stylesheets">style/patient.css,javascript/customcheckbox/prettyCheckboxes.css,../dhis-web-commons/paging/paging.css</param>
</action>
<action name="viewProgramStageRecords" class="org.hisp.dhis.caseentry.action.caseentry.ProgramStageCustomDataEntryAction">
@@ -200,7 +185,7 @@
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-caseentry/reportSelect.vm</param>
<param name="menu">/dhis-web-caseentry/reportsMenu.vm</param>
- <param name="javascripts">../dhis-web-commons/ouwt/ouwt.js,../dhis-web-commons/calendar/calendar.js,../dhis-web-commons/calendar/calendar-lang.js,../dhis-web-commons/calendar/calendar-setup.js,javascript/report.js</param>
+ <param name="javascripts">../dhis-web-commons/ouwt/ouwt.js,javascript/report.js</param>
</action>
<action name="validateReportParameters"
@@ -216,7 +201,7 @@
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-caseentry/report.vm</param>
<param name="menu">/dhis-web-caseentry/reportsMenu.vm</param>
- <param name="javascripts">../dhis-web-commons/ouwt/ouwt.js,../dhis-web-commons/calendar/calendar.js,../dhis-web-commons/calendar/calendar-lang.js,../dhis-web-commons/calendar/calendar-setup.js,javascript/report.js</param>
+ <param name="javascripts">../dhis-web-commons/ouwt/ouwt.js,javascript/report.js</param>
<param name="stylesheets">../dhis-web-commons/paging/paging.css</param>
</action>
@@ -225,11 +210,10 @@
<param name="page">/dhis-web-caseentry/records.vm</param>
</action>
- <action name="getPatientDetails"
- class="org.hisp.dhis.caseentry.action.report.GetPatientDetailsAction">
- <result name="success" type="velocity-xml">/dhis-web-caseentry/responsePatientDetails.vm</result>
- <param name="onExceptionReturn">plainTextError</param>
- </action>
+ <action name="getPatientDetails" class="org.hisp.dhis.caseentry.action.report.GetPatientDetailsAction">
+ <result name="success" type="velocity-xml">/dhis-web-caseentry/responsePatientDetails.vm</result>
+ <param name="onExceptionReturn">plainTextError</param>
+ </action>
<!-- Case Aggregation -->
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryForm.vm 2010-10-28 09:17:13 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryForm.vm 2010-11-19 09:27:17 +0000
@@ -1,3 +1,9 @@
+<script>
+function setupDataEntryCalendar( id )
+{
+ datePicker( id );
+}
+</script>
#parse( "/dhis-web-caseentry/dataRecordingSelect.vm" )
<div id="dragDiv">
@@ -23,7 +29,7 @@
</div>
<script>
initCustomCheckboxes();
- DRAG_DIV.init();
+ DRAG_DIV.init();
</script>
#else
@@ -83,7 +89,7 @@
#elseif( $programStageDataElement.dataElement.type == "date" )
<input type="text" data="{compulsory: $programStageDataElement.compulsory }" #if($programStageInstance.completed) disabled="disabled" #end id="value[$programStageDataElement.dataElement.id].date" name="entryfield" value="$!encoder.htmlEncode( $patientDataValue.value )" onchange="saveDateValue( $programStageDataElement.dataElement.id, '$encoder.jsEncode( $programStageDataElement.dataElement.name )' )" tabindex="$tabIndex" >
<script type="text/javascript">
- datePicker('value[$programStageDataElement.dataElement.id].date');
+ setupDataEntryCalendar('value\\[$programStageDataElement.dataElement.id\\]\\.date');
</script>
#else
<input name="entryfield" data="{compulsory: $programStageDataElement.compulsory }" #if($programStageInstance.completed) disabled="disabled" #end id="value[$programStageDataElement.dataElement.id].value" type="text" value="$!encoder.htmlEncode( $patientDataValue.value )" onchange="saveValue( $programStageDataElement.dataElement.id, '$encoder.jsEncode( $programStageDataElement.dataElement.name )' )" onkeypress="return keyPress(event, this)" tabindex="$tabIndex" >
=== removed directory 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/calendar'
=== removed file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/calendar/calendar-lang.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/calendar/calendar-lang.js 2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/calendar/calendar-lang.js 1970-01-01 00:00:00 +0000
@@ -1,127 +0,0 @@
-// ** I18N
-
-// Calendar EN language
-// Author: Mihai Bazon, <mihai_bazon@xxxxxxxxx>
-// Encoding: any
-// Distributed under the same terms as the calendar itself.
-
-// For translators: please use UTF-8 if possible. We strongly believe that
-// Unicode is the answer to a real internationalized world. Also please
-// include your contact information in the header, as can be seen above.
-
-// full day names
-Calendar._DN = new Array
-("Sunday",
- "Monday",
- "Tuesday",
- "Wednesday",
- "Thursday",
- "Friday",
- "Saturday",
- "Sunday");
-
-// Please note that the following array of short day names (and the same goes
-// for short month names, _SMN) isn't absolutely necessary. We give it here
-// for exemplification on how one can customize the short day names, but if
-// they are simply the first N letters of the full name you can simply say:
-//
-// Calendar._SDN_len = N; // short day name length
-// Calendar._SMN_len = N; // short month name length
-//
-// If N = 3 then this is not needed either since we assume a value of 3 if not
-// present, to be compatible with translation files that were written before
-// this feature.
-
-// short day names
-Calendar._SDN = new Array
-("Sun",
- "Mon",
- "Tue",
- "Wed",
- "Thu",
- "Fri",
- "Sat",
- "Sun");
-
-// First day of the week. "0" means display Sunday first, "1" means display
-// Monday first, etc.
-Calendar._FD = 0;
-
-// full month names
-Calendar._MN = new Array
-("January",
- "February",
- "March",
- "April",
- "May",
- "June",
- "July",
- "August",
- "September",
- "October",
- "November",
- "December");
-
-// short month names
-Calendar._SMN = new Array
-("Jan",
- "Feb",
- "Mar",
- "Apr",
- "May",
- "Jun",
- "Jul",
- "Aug",
- "Sep",
- "Oct",
- "Nov",
- "Dec");
-
-// tooltips
-Calendar._TT = {};
-Calendar._TT["INFO"] = "About the calendar";
-
-Calendar._TT["ABOUT"] =
-"DHTML Date/Time Selector\n" +
-"(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" + // don't translate this this ;-)
-"For latest version visit: http://www.dynarch.com/projects/calendar/\n"; +
-"Distributed under GNU LGPL. See http://gnu.org/licenses/lgpl.html for details." +
-"\n\n" +
-"Date selection:\n" +
-"- Use the \xab, \xbb buttons to select year\n" +
-"- Use the " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + " buttons to select month\n" +
-"- Hold mouse button on any of the above buttons for faster selection.";
-Calendar._TT["ABOUT_TIME"] = "\n\n" +
-"Time selection:\n" +
-"- Click on any of the time parts to increase it\n" +
-"- or Shift-click to decrease it\n" +
-"- or click and drag for faster selection.";
-
-Calendar._TT["PREV_YEAR"] = "Prev. year (hold for menu)";
-Calendar._TT["PREV_MONTH"] = "Prev. month (hold for menu)";
-Calendar._TT["GO_TODAY"] = "Go Today";
-Calendar._TT["NEXT_MONTH"] = "Next month (hold for menu)";
-Calendar._TT["NEXT_YEAR"] = "Next year (hold for menu)";
-Calendar._TT["SEL_DATE"] = "Select date";
-Calendar._TT["DRAG_TO_MOVE"] = "Drag to move";
-Calendar._TT["PART_TODAY"] = " (today)";
-
-// the following is to inform that "%s" is to be the first day of week
-// %s will be replaced with the day name.
-Calendar._TT["DAY_FIRST"] = "Display %s first";
-
-// This may be locale-dependent. It specifies the week-end days, as an array
-// of comma-separated numbers. The numbers are from 0 to 6: 0 means Sunday, 1
-// means Monday, etc.
-Calendar._TT["WEEKEND"] = "0,6";
-
-Calendar._TT["CLOSE"] = "Close";
-Calendar._TT["TODAY"] = "Today";
-Calendar._TT["TIME_PART"] = "(Shift-)Click or drag to change value";
-
-// date formats
-Calendar._TT["DEF_DATE_FORMAT"] = "%Y-%m-%d";
-Calendar._TT["TT_DATE_FORMAT"] = "%a, %b %e";
-
-Calendar._TT["WK"] = "wk";
-Calendar._TT["TIME"] = "Time:";
=== removed file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/calendar/calendar-setup.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/calendar/calendar-setup.js 2010-02-22 09:19:15 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/calendar/calendar-setup.js 1970-01-01 00:00:00 +0000
@@ -1,240 +0,0 @@
-/* Copyright Mihai Bazon, 2002, 2003 | http://dynarch.com/mishoo/
- * ---------------------------------------------------------------------------
- *
- * The DHTML Calendar
- *
- * Details and latest version at:
- * http://dynarch.com/mishoo/calendar.epl
- *
- * This script is distributed under the GNU Lesser General Public License.
- * Read the entire license text here: http://www.gnu.org/licenses/lgpl.html
- *
- * This file defines helper functions for setting up the calendar. They are
- * intended to help non-programmers get a working calendar on their site
- * quickly. This script should not be seen as part of the calendar. It just
- * shows you what one can do with the calendar, while in the same time
- * providing a quick and simple method for setting it up. If you need
- * exhaustive customization of the calendar creation process feel free to
- * modify this code to suit your needs (this is recommended and much better
- * than modifying calendar.js itself).
- */
-
-// $Id: calendar-setup.js 1682 2006-06-14 09:26:17Z quangnguyen $
-// Modified by Nguyen Dang Quang 2006/06/14
-
-/**
- * This function "patches" an input field (or other element) to use a calendar
- * widget for date selection.
- *
- * The "params" is a single object that can have the following properties:
- *
- * prop. name | description
- * -------------------------------------------------------------------------------------------------
- * inputField | the ID of an input field to store the date
- * displayArea | the ID of a DIV or other element to show the date
- * button | ID of a button or other element that will trigger the calendar
- * eventName | event that will trigger the calendar, without the "on" prefix (default: "click")
- * ifFormat | date format that will be stored in the input field
- * daFormat | the date format that will be used to display the date in displayArea
- * singleClick | (true/false) wether the calendar is in single click mode or not (default: true)
- * firstDay | numeric: 0 to 6. "0" means display Sunday first, "1" means display Monday first, etc.
- * align | alignment (default: "Br"); if you don't know what's this see the calendar documentation
- * range | array with 2 elements. Default: [1900, 2999] -- the range of years available
- * weekNumbers | (true/false) if it's true (default) the calendar will display week numbers
- * flat | null or element ID; if not null the calendar will be a flat calendar having the parent with the given ID
- * flatCallback | function that receives a JS Date object and returns an URL to point the browser to (for flat calendar)
- * disableFunc | function that receives a JS Date object and should return true if that date has to be disabled in the calendar
- * onSelect | function that gets called when a date is selected. You don't _have_ to supply this (the default is generally okay)
- * onClose | function that gets called when the calendar is closed. [default]
- * onUpdate | function that gets called after the date is updated in the input field. Receives a reference to the calendar.
- * date | the date that the calendar will be initially displayed to
- * showsTime | default: false; if true the calendar will include a time selector
- * timeFormat | the time format; can be "12" or "24", default is "12"
- * electric | if true (default) then given fields/date areas are updated for each move; otherwise they're updated only on close
- * step | configures the step of the years in drop-down boxes; default: 2
- * position | configures the calendar absolute position; default: null
- * cache | if "true" (but default: "false") it will reuse the same calendar object, where possible
- * showOthers | if "true" (but default: "false") it will show days from other months too
- *
- * None of them is required, they all have default values. However, if you
- * pass none of "inputField", "displayArea" or "button" you'll get a warning
- * saying "nothing to setup".
- */
-
-Calendar.setup = function (params) {
- function param_default(pname, def) { if (typeof params[pname] == "undefined") { params[pname] = def; } };
-
- param_default("inputField", null);
- param_default("displayArea", null);
- param_default("button", null);
- param_default("eventName", "click");
- param_default("ifFormat", "%Y/%m/%d");
- param_default("daFormat", "%Y/%m/%d");
- param_default("singleClick", true);
- param_default("disableFunc", null);
- param_default("dateStatusFunc", params["disableFunc"]); // takes precedence if both are defined
- param_default("dateText", null);
- param_default("firstDay", null);
- param_default("align", "Br");
- param_default("range", [1900, 2999]);
- param_default("weekNumbers", true);
- param_default("flat", null);
- param_default("flatCallback", null);
- param_default("onSelect", null);
- param_default("onClose", null);
- param_default("onUpdate", null);
- param_default("date", null);
- param_default("showsTime", false);
- param_default("timeFormat", "24");
- param_default("electric", true);
- param_default("step", 2);
- param_default("position", null);
- param_default("cache", false);
- param_default("showOthers", false);
- param_default("multiple", null);
-
- var format = params.ifFormat;
-
- var outformat = "";
-
- for (i = 0 ; i < format.length; i++)
- {
- if ((format.charAt(i) == "d") && (format.charAt(i+1) == "d")) {
- outformat = outformat + "%d"
- i += 2
- }
-
- if ((format.charAt(i) == "m") && (format.charAt(i+1) == "m")) {
- outformat = outformat + "%m"
- i += 2
- }
-
- if ((format.charAt(i) == "y") && (format.charAt(i+1) == "y") && (format.charAt(i+2) == "y") && (format.charAt(i+3) == "y")) {
- outformat = outformat + "%Y"
- i += 3
- }
-
- else {
- outformat = outformat + format.charAt(i)
- }
- }
-
- params.ifFormat = outformat;
-
- var tmp = ["inputField", "displayArea", "button"];
- for (var i in tmp) {
- if (typeof params[tmp[i]] == "string") {
- params[tmp[i]] = document.getElementById(params[tmp[i]]);
- }
- }
- if (!(params.flat || params.multiple || params.inputField || params.displayArea || params.button)) {
- alert("Calendar.setup:\n Nothing to setup (no fields found). Please check your code");
- return false;
- }
-
- //----------------------------------------------------------------------------
- // If the input field is disabled then do not setup this calendar
- // @modified Viet Nguyen
- //----------------------------------------------------------------------------
- if( jQuery(params.inputField).attr("disabled") )
- {
- jQuery(params.button).hide();
- return false;
- }
-
- function onSelect(cal) {
- var p = cal.params;
- var update = (cal.dateClicked || p.electric);
- if (update && p.inputField) {
- p.inputField.value = cal.date.print(p.ifFormat);
- if (typeof p.inputField.onchange == "function")
- p.inputField.onchange();
- }
- if (update && p.displayArea)
- p.displayArea.innerHTML = cal.date.print(p.daFormat);
- if (update && typeof p.onUpdate == "function")
- p.onUpdate(cal);
- if (update && p.flat) {
- if (typeof p.flatCallback == "function")
- p.flatCallback(cal);
- }
- if (update && p.singleClick && cal.dateClicked)
- cal.callCloseHandler();
- };
-
- if (params.flat != null) {
- if (typeof params.flat == "string")
- params.flat = document.getElementById(params.flat);
- if (!params.flat) {
- alert("Calendar.setup:\n Flat specified but can't find parent.");
- return false;
- }
- var cal = new Calendar(params.firstDay, params.date, params.onSelect || onSelect);
- cal.showsOtherMonths = params.showOthers;
- cal.showsTime = params.showsTime;
- cal.time24 = (params.timeFormat == "24");
- cal.params = params;
- cal.weekNumbers = params.weekNumbers;
- cal.setRange(params.range[0], params.range[1]);
- cal.setDateStatusHandler(params.dateStatusFunc);
- cal.getDateText = params.dateText;
- if (params.ifFormat) {
- cal.setDateFormat(params.ifFormat);
- }
- if (params.inputField && typeof params.inputField.value == "string") {
- cal.parseDate(params.inputField.value);
- }
- cal.create(params.flat);
- cal.show();
- return false;
- }
-
- var triggerEl = params.button || params.displayArea || params.inputField;
- triggerEl["on" + params.eventName] = function() {
- var dateEl = params.inputField || params.displayArea;
- var dateFmt = params.inputField ? params.ifFormat : params.daFormat;
- var mustCreate = false;
- var cal = window.calendar;
- if (dateEl)
- params.date = Date.parseDate(dateEl.value || dateEl.innerHTML, dateFmt);
- if (!(cal && params.cache)) {
- window.calendar = cal = new Calendar(params.firstDay,
- params.date,
- params.onSelect || onSelect,
- params.onClose || function(cal) { cal.hide(); });
- cal.showsTime = params.showsTime;
- cal.time24 = (params.timeFormat == "24");
- cal.weekNumbers = params.weekNumbers;
- mustCreate = true;
- } else {
- if (params.date)
- cal.setDate(params.date);
- cal.hide();
- }
- if (params.multiple) {
- cal.multiple = {};
- for (var i = params.multiple.length; --i >= 0;) {
- var d = params.multiple[i];
- var ds = d.print("%Y%m%d");
- cal.multiple[ds] = d;
- }
- }
- cal.showsOtherMonths = params.showOthers;
- cal.yearStep = params.step;
- cal.setRange(params.range[0], params.range[1]);
- cal.params = params;
- cal.setDateStatusHandler(params.dateStatusFunc);
- cal.getDateText = params.dateText;
- cal.setDateFormat(dateFmt);
- if (mustCreate)
- cal.create();
- cal.refresh();
- if (!params.position)
- cal.showAtElement(params.button || params.displayArea || params.inputField, params.align);
- else
- cal.showAt(params.position[0], params.position[1]);
- return false;
- };
-
- return cal;
-};
=== removed file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/calendar/calendar.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/calendar/calendar.js 2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/calendar/calendar.js 1970-01-01 00:00:00 +0000
@@ -1,1806 +0,0 @@
-/* Copyright Mihai Bazon, 2002-2005 | www.bazon.net/mishoo
- * -----------------------------------------------------------
- *
- * The DHTML Calendar, version 1.0 "It is happening again"
- *
- * Details and latest version at:
- * www.dynarch.com/projects/calendar
- *
- * This script is developed by Dynarch.com. Visit us at www.dynarch.com.
- *
- * This script is distributed under the GNU Lesser General Public License.
- * Read the entire license text here: http://www.gnu.org/licenses/lgpl.html
- */
-
-// $Id: calendar.js 1682 2006-06-14 09:26:17Z quangnguyen $
-
-/** The Calendar object constructor. */
-Calendar = function (firstDayOfWeek, dateStr, onSelected, onClose) {
- // member variables
- this.activeDiv = null;
- this.currentDateEl = null;
- this.getDateStatus = null;
- this.getDateToolTip = null;
- this.getDateText = null;
- this.timeout = null;
- this.onSelected = onSelected || null;
- this.onClose = onClose || null;
- this.dragging = false;
- this.hidden = false;
- this.minYear = 1970;
- this.maxYear = 2050;
- this.dateFormat = Calendar._TT["DEF_DATE_FORMAT"];
- this.ttDateFormat = Calendar._TT["TT_DATE_FORMAT"];
- this.isPopup = true;
- this.weekNumbers = true;
- this.firstDayOfWeek = typeof firstDayOfWeek == "number" ? firstDayOfWeek : Calendar._FD; // 0 for Sunday, 1 for Monday, etc.
- this.showsOtherMonths = false;
- this.dateStr = dateStr;
- this.ar_days = null;
- this.showsTime = false;
- this.time24 = true;
- this.yearStep = 2;
- this.hiliteToday = true;
- this.multiple = null;
- // HTML elements
- this.table = null;
- this.element = null;
- this.tbody = null;
- this.firstdayname = null;
- // Combo boxes
- this.monthsCombo = null;
- this.yearsCombo = null;
- this.hilitedMonth = null;
- this.activeMonth = null;
- this.hilitedYear = null;
- this.activeYear = null;
- // Information
- this.dateClicked = false;
-
- // one-time initializations
- if (typeof Calendar._SDN == "undefined") {
- // table of short day names
- if (typeof Calendar._SDN_len == "undefined")
- Calendar._SDN_len = 3;
- var ar = new Array();
- for (var i = 8; i > 0;) {
- ar[--i] = Calendar._DN[i].substr(0, Calendar._SDN_len);
- }
- Calendar._SDN = ar;
- // table of short month names
- if (typeof Calendar._SMN_len == "undefined")
- Calendar._SMN_len = 3;
- ar = new Array();
- for (var i = 12; i > 0;) {
- ar[--i] = Calendar._MN[i].substr(0, Calendar._SMN_len);
- }
- Calendar._SMN = ar;
- }
-};
-
-// ** constants
-
-/// "static", needed for event handlers.
-Calendar._C = null;
-
-/// detect a special case of "web browser"
-Calendar.is_ie = ( /msie/i.test(navigator.userAgent) &&
- !/opera/i.test(navigator.userAgent) );
-
-Calendar.is_ie5 = ( Calendar.is_ie && /msie 5\.0/i.test(navigator.userAgent) );
-
-/// detect Opera browser
-Calendar.is_opera = /opera/i.test(navigator.userAgent);
-
-/// detect KHTML-based browsers
-Calendar.is_khtml = /Konqueror|Safari|KHTML/i.test(navigator.userAgent);
-
-// BEGIN: UTILITY FUNCTIONS; beware that these might be moved into a separate
-// library, at some point.
-
-Calendar.getAbsolutePos = function(el) {
- var SL = 0, ST = 0;
- var is_div = /^div$/i.test(el.tagName);
- if (is_div && el.scrollLeft)
- SL = el.scrollLeft;
- if (is_div && el.scrollTop)
- ST = el.scrollTop;
- var r = { x: el.offsetLeft - SL, y: el.offsetTop - ST };
- if (el.offsetParent) {
- var tmp = this.getAbsolutePos(el.offsetParent);
- r.x += tmp.x;
- r.y += tmp.y;
- }
- return r;
-};
-
-Calendar.isRelated = function (el, evt) {
- var related = evt.relatedTarget;
- if (!related) {
- var type = evt.type;
- if (type == "mouseover") {
- related = evt.fromElement;
- } else if (type == "mouseout") {
- related = evt.toElement;
- }
- }
- while (related) {
- if (related == el) {
- return true;
- }
- related = related.parentNode;
- }
- return false;
-};
-
-Calendar.removeClass = function(el, className) {
- if (!(el && el.className)) {
- return;
- }
- var cls = el.className.split(" ");
- var ar = new Array();
- for (var i = cls.length; i > 0;) {
- if (cls[--i] != className) {
- ar[ar.length] = cls[i];
- }
- }
- el.className = ar.join(" ");
-};
-
-Calendar.addClass = function(el, className) {
- Calendar.removeClass(el, className);
- el.className += " " + className;
-};
-
-// FIXME: the following 2 functions totally suck, are useless and should be replaced immediately.
-Calendar.getElement = function(ev) {
- var f = Calendar.is_ie ? window.event.srcElement : ev.currentTarget;
- while (f.nodeType != 1 || /^div$/i.test(f.tagName))
- f = f.parentNode;
- return f;
-};
-
-Calendar.getTargetElement = function(ev) {
- var f = Calendar.is_ie ? window.event.srcElement : ev.target;
- while (f.nodeType != 1)
- f = f.parentNode;
- return f;
-};
-
-Calendar.stopEvent = function(ev) {
- ev || (ev = window.event);
- if (Calendar.is_ie) {
- ev.cancelBubble = true;
- ev.returnValue = false;
- } else {
- ev.preventDefault();
- ev.stopPropagation();
- }
- return false;
-};
-
-Calendar.addEvent = function(el, evname, func) {
- if (el.attachEvent) { // IE
- el.attachEvent("on" + evname, func);
- } else if (el.addEventListener) { // Gecko / W3C
- el.addEventListener(evname, func, true);
- } else {
- el["on" + evname] = func;
- }
-};
-
-Calendar.removeEvent = function(el, evname, func) {
- if (el.detachEvent) { // IE
- el.detachEvent("on" + evname, func);
- } else if (el.removeEventListener) { // Gecko / W3C
- el.removeEventListener(evname, func, true);
- } else {
- el["on" + evname] = null;
- }
-};
-
-Calendar.createElement = function(type, parent) {
- var el = null;
- if (document.createElementNS) {
- // use the XHTML namespace; IE won't normally get here unless
- // _they_ "fix" the DOM2 implementation.
- el = document.createElementNS("http://www.w3.org/1999/xhtml";, type);
- } else {
- el = document.createElement(type);
- }
- if (typeof parent != "undefined") {
- parent.appendChild(el);
- }
- return el;
-};
-
-// END: UTILITY FUNCTIONS
-
-// BEGIN: CALENDAR STATIC FUNCTIONS
-
-/** Internal -- adds a set of events to make some element behave like a button. */
-Calendar._add_evs = function(el) {
- with (Calendar) {
- addEvent(el, "mouseover", dayMouseOver);
- addEvent(el, "mousedown", dayMouseDown);
- addEvent(el, "mouseout", dayMouseOut);
- if (is_ie) {
- addEvent(el, "dblclick", dayMouseDblClick);
- el.setAttribute("unselectable", true);
- }
- }
-};
-
-Calendar.findMonth = function(el) {
- if (typeof el.month != "undefined") {
- return el;
- } else if (typeof el.parentNode.month != "undefined") {
- return el.parentNode;
- }
- return null;
-};
-
-Calendar.findYear = function(el) {
- if (typeof el.year != "undefined") {
- return el;
- } else if (typeof el.parentNode.year != "undefined") {
- return el.parentNode;
- }
- return null;
-};
-
-Calendar.showMonthsCombo = function () {
- var cal = Calendar._C;
- if (!cal) {
- return false;
- }
- var cal = cal;
- var cd = cal.activeDiv;
- var mc = cal.monthsCombo;
- if (cal.hilitedMonth) {
- Calendar.removeClass(cal.hilitedMonth, "hilite");
- }
- if (cal.activeMonth) {
- Calendar.removeClass(cal.activeMonth, "active");
- }
- var mon = cal.monthsCombo.getElementsByTagName("div")[cal.date.getMonth()];
- Calendar.addClass(mon, "active");
- cal.activeMonth = mon;
- var s = mc.style;
- s.display = "block";
- if (cd.navtype < 0)
- s.left = cd.offsetLeft + "px";
- else {
- var mcw = mc.offsetWidth;
- if (typeof mcw == "undefined")
- // Konqueror brain-dead techniques
- mcw = 50;
- s.left = (cd.offsetLeft + cd.offsetWidth - mcw) + "px";
- }
- s.top = (cd.offsetTop + cd.offsetHeight) + "px";
-};
-
-Calendar.showYearsCombo = function (fwd) {
- var cal = Calendar._C;
- if (!cal) {
- return false;
- }
- var cal = cal;
- var cd = cal.activeDiv;
- var yc = cal.yearsCombo;
- if (cal.hilitedYear) {
- Calendar.removeClass(cal.hilitedYear, "hilite");
- }
- if (cal.activeYear) {
- Calendar.removeClass(cal.activeYear, "active");
- }
- cal.activeYear = null;
- var Y = cal.date.getFullYear() + (fwd ? 1 : -1);
- var yr = yc.firstChild;
- var show = false;
- for (var i = 12; i > 0; --i) {
- if (Y >= cal.minYear && Y <= cal.maxYear) {
- yr.innerHTML = Y;
- yr.year = Y;
- yr.style.display = "block";
- show = true;
- } else {
- yr.style.display = "none";
- }
- yr = yr.nextSibling;
- Y += fwd ? cal.yearStep : -cal.yearStep;
- }
- if (show) {
- var s = yc.style;
- s.display = "block";
- if (cd.navtype < 0)
- s.left = cd.offsetLeft + "px";
- else {
- var ycw = yc.offsetWidth;
- if (typeof ycw == "undefined")
- // Konqueror brain-dead techniques
- ycw = 50;
- s.left = (cd.offsetLeft + cd.offsetWidth - ycw) + "px";
- }
- s.top = (cd.offsetTop + cd.offsetHeight) + "px";
- }
-};
-
-// event handlers
-
-Calendar.tableMouseUp = function(ev) {
- var cal = Calendar._C;
- if (!cal) {
- return false;
- }
- if (cal.timeout) {
- clearTimeout(cal.timeout);
- }
- var el = cal.activeDiv;
- if (!el) {
- return false;
- }
- var target = Calendar.getTargetElement(ev);
- ev || (ev = window.event);
- Calendar.removeClass(el, "active");
- if (target == el || target.parentNode == el) {
- Calendar.cellClick(el, ev);
- }
- var mon = Calendar.findMonth(target);
- var date = null;
- if (mon) {
- date = new Date(cal.date);
- if (mon.month != date.getMonth()) {
- date.setMonth(mon.month);
- cal.setDate(date);
- cal.dateClicked = false;
- cal.callHandler();
- }
- } else {
- var year = Calendar.findYear(target);
- if (year) {
- date = new Date(cal.date);
- if (year.year != date.getFullYear()) {
- date.setFullYear(year.year);
- cal.setDate(date);
- cal.dateClicked = false;
- cal.callHandler();
- }
- }
- }
- with (Calendar) {
- removeEvent(document, "mouseup", tableMouseUp);
- removeEvent(document, "mouseover", tableMouseOver);
- removeEvent(document, "mousemove", tableMouseOver);
- cal._hideCombos();
- _C = null;
- return stopEvent(ev);
- }
-};
-
-Calendar.tableMouseOver = function (ev) {
- var cal = Calendar._C;
- if (!cal) {
- return;
- }
- var el = cal.activeDiv;
- var target = Calendar.getTargetElement(ev);
- if (target == el || target.parentNode == el) {
- Calendar.addClass(el, "hilite active");
- Calendar.addClass(el.parentNode, "rowhilite");
- } else {
- if (typeof el.navtype == "undefined" || (el.navtype != 50 && (el.navtype == 0 || Math.abs(el.navtype) > 2)))
- Calendar.removeClass(el, "active");
- Calendar.removeClass(el, "hilite");
- Calendar.removeClass(el.parentNode, "rowhilite");
- }
- ev || (ev = window.event);
- if (el.navtype == 50 && target != el) {
- var pos = Calendar.getAbsolutePos(el);
- var w = el.offsetWidth;
- var x = ev.clientX;
- var dx;
- var decrease = true;
- if (x > pos.x + w) {
- dx = x - pos.x - w;
- decrease = false;
- } else
- dx = pos.x - x;
-
- if (dx < 0) dx = 0;
- var range = el._range;
- var current = el._current;
- var count = Math.floor(dx / 10) % range.length;
- for (var i = range.length; --i >= 0;)
- if (range[i] == current)
- break;
- while (count-- > 0)
- if (decrease) {
- if (--i < 0)
- i = range.length - 1;
- } else if ( ++i >= range.length )
- i = 0;
- var newval = range[i];
- el.innerHTML = newval;
-
- cal.onUpdateTime();
- }
- var mon = Calendar.findMonth(target);
- if (mon) {
- if (mon.month != cal.date.getMonth()) {
- if (cal.hilitedMonth) {
- Calendar.removeClass(cal.hilitedMonth, "hilite");
- }
- Calendar.addClass(mon, "hilite");
- cal.hilitedMonth = mon;
- } else if (cal.hilitedMonth) {
- Calendar.removeClass(cal.hilitedMonth, "hilite");
- }
- } else {
- if (cal.hilitedMonth) {
- Calendar.removeClass(cal.hilitedMonth, "hilite");
- }
- var year = Calendar.findYear(target);
- if (year) {
- if (year.year != cal.date.getFullYear()) {
- if (cal.hilitedYear) {
- Calendar.removeClass(cal.hilitedYear, "hilite");
- }
- Calendar.addClass(year, "hilite");
- cal.hilitedYear = year;
- } else if (cal.hilitedYear) {
- Calendar.removeClass(cal.hilitedYear, "hilite");
- }
- } else if (cal.hilitedYear) {
- Calendar.removeClass(cal.hilitedYear, "hilite");
- }
- }
- return Calendar.stopEvent(ev);
-};
-
-Calendar.tableMouseDown = function (ev) {
- if (Calendar.getTargetElement(ev) == Calendar.getElement(ev)) {
- return Calendar.stopEvent(ev);
- }
-};
-
-Calendar.calDragIt = function (ev) {
- var cal = Calendar._C;
- if (!(cal && cal.dragging)) {
- return false;
- }
- var posX;
- var posY;
- if (Calendar.is_ie) {
- posY = window.event.clientY + document.body.scrollTop;
- posX = window.event.clientX + document.body.scrollLeft;
- } else {
- posX = ev.pageX;
- posY = ev.pageY;
- }
- cal.hideShowCovered();
- var st = cal.element.style;
- st.left = (posX - cal.xOffs) + "px";
- st.top = (posY - cal.yOffs) + "px";
- return Calendar.stopEvent(ev);
-};
-
-Calendar.calDragEnd = function (ev) {
- var cal = Calendar._C;
- if (!cal) {
- return false;
- }
- cal.dragging = false;
- with (Calendar) {
- removeEvent(document, "mousemove", calDragIt);
- removeEvent(document, "mouseup", calDragEnd);
- tableMouseUp(ev);
- }
- cal.hideShowCovered();
-};
-
-Calendar.dayMouseDown = function(ev) {
- var el = Calendar.getElement(ev);
- if (el.disabled) {
- return false;
- }
- var cal = el.calendar;
- cal.activeDiv = el;
- Calendar._C = cal;
- if (el.navtype != 300) with (Calendar) {
- if (el.navtype == 50) {
- el._current = el.innerHTML;
- addEvent(document, "mousemove", tableMouseOver);
- } else
- addEvent(document, Calendar.is_ie5 ? "mousemove" : "mouseover", tableMouseOver);
- addClass(el, "hilite active");
- addEvent(document, "mouseup", tableMouseUp);
- } else if (cal.isPopup) {
- cal._dragStart(ev);
- }
- if (el.navtype == -1 || el.navtype == 1) {
- if (cal.timeout) clearTimeout(cal.timeout);
- cal.timeout = setTimeout("Calendar.showMonthsCombo()", 250);
- } else if (el.navtype == -2 || el.navtype == 2) {
- if (cal.timeout) clearTimeout(cal.timeout);
- cal.timeout = setTimeout((el.navtype > 0) ? "Calendar.showYearsCombo(true)" : "Calendar.showYearsCombo(false)", 250);
- } else {
- cal.timeout = null;
- }
- return Calendar.stopEvent(ev);
-};
-
-Calendar.dayMouseDblClick = function(ev) {
- Calendar.cellClick(Calendar.getElement(ev), ev || window.event);
- if (Calendar.is_ie) {
- document.selection.empty();
- }
-};
-
-Calendar.dayMouseOver = function(ev) {
- var el = Calendar.getElement(ev);
- if (Calendar.isRelated(el, ev) || Calendar._C || el.disabled) {
- return false;
- }
- if (el.ttip) {
- if (el.ttip.substr(0, 1) == "_") {
- el.ttip = el.caldate.print(el.calendar.ttDateFormat) + el.ttip.substr(1);
- }
- el.calendar.tooltips.innerHTML = el.ttip;
- }
- if (el.navtype != 300) {
- Calendar.addClass(el, "hilite");
- if (el.caldate) {
- Calendar.addClass(el.parentNode, "rowhilite");
- }
- }
- return Calendar.stopEvent(ev);
-};
-
-Calendar.dayMouseOut = function(ev) {
- with (Calendar) {
- var el = getElement(ev);
- if (isRelated(el, ev) || _C || el.disabled)
- return false;
- removeClass(el, "hilite");
- if (el.caldate)
- removeClass(el.parentNode, "rowhilite");
- if (el.calendar)
- el.calendar.tooltips.innerHTML = _TT["SEL_DATE"];
- return stopEvent(ev);
- }
-};
-
-/**
- * A generic "click" handler :) handles all types of buttons defined in this
- * calendar.
- */
-Calendar.cellClick = function(el, ev) {
- var cal = el.calendar;
- var closing = false;
- var newdate = false;
- var date = null;
- if (typeof el.navtype == "undefined") {
- if (cal.currentDateEl) {
- Calendar.removeClass(cal.currentDateEl, "selected");
- Calendar.addClass(el, "selected");
- closing = (cal.currentDateEl == el);
- if (!closing) {
- cal.currentDateEl = el;
- }
- }
- cal.date.setDateOnly(el.caldate);
- date = cal.date;
- var other_month = !(cal.dateClicked = !el.otherMonth);
- if (!other_month && !cal.currentDateEl)
- cal._toggleMultipleDate(new Date(date));
- else
- newdate = !el.disabled;
- // a date was clicked
- if (other_month)
- cal._init(cal.firstDayOfWeek, date);
- } else {
- if (el.navtype == 200) {
- Calendar.removeClass(el, "hilite");
- cal.callCloseHandler();
- return;
- }
- date = new Date(cal.date);
- if (el.navtype == 0)
- date.setDateOnly(new Date()); // TODAY
- // unless "today" was clicked, we assume no date was clicked so
- // the selected handler will know not to close the calenar when
- // in single-click mode.
- // cal.dateClicked = (el.navtype == 0);
- cal.dateClicked = false;
- var year = date.getFullYear();
- var mon = date.getMonth();
- function setMonth(m) {
- var day = date.getDate();
- var max = date.getMonthDays(m);
- if (day > max) {
- date.setDate(max);
- }
- date.setMonth(m);
- };
- switch (el.navtype) {
- case 400:
- Calendar.removeClass(el, "hilite");
- var text = Calendar._TT["ABOUT"];
- if (typeof text != "undefined") {
- text += cal.showsTime ? Calendar._TT["ABOUT_TIME"] : "";
- } else {
- // FIXME: this should be removed as soon as lang files get updated!
- text = "Help and about box text is not translated into this language.\n" +
- "If you know this language and you feel generous please update\n" +
- "the corresponding file in \"lang\" subdir to match calendar-en.js\n" +
- "and send it back to <mihai_bazon@xxxxxxxxx> to get it into the distribution ;-)\n\n" +
- "Thank you!\n" +
- "http://dynarch.com/mishoo/calendar.epl\n";;
- }
- alert(text);
- return;
- case -2:
- if (year > cal.minYear) {
- date.setFullYear(year - 1);
- }
- break;
- case -1:
- if (mon > 0) {
- setMonth(mon - 1);
- } else if (year-- > cal.minYear) {
- date.setFullYear(year);
- setMonth(11);
- }
- break;
- case 1:
- if (mon < 11) {
- setMonth(mon + 1);
- } else if (year < cal.maxYear) {
- date.setFullYear(year + 1);
- setMonth(0);
- }
- break;
- case 2:
- if (year < cal.maxYear) {
- date.setFullYear(year + 1);
- }
- break;
- case 100:
- cal.setFirstDayOfWeek(el.fdow);
- return;
- case 50:
- var range = el._range;
- var current = el.innerHTML;
- for (var i = range.length; --i >= 0;)
- if (range[i] == current)
- break;
- if (ev && ev.shiftKey) {
- if (--i < 0)
- i = range.length - 1;
- } else if ( ++i >= range.length )
- i = 0;
- var newval = range[i];
- el.innerHTML = newval;
- cal.onUpdateTime();
- return;
- case 0:
- // TODAY will bring us here
- if ((typeof cal.getDateStatus == "function") &&
- cal.getDateStatus(date, date.getFullYear(), date.getMonth(), date.getDate())) {
- return false;
- }
- break;
- }
- if (!date.equalsTo(cal.date)) {
- cal.setDate(date);
- newdate = true;
- } else if (el.navtype == 0)
- newdate = closing = true;
- }
- if (newdate) {
- ev && cal.callHandler();
- }
- if (closing) {
- Calendar.removeClass(el, "hilite");
- ev && cal.callCloseHandler();
- }
-};
-
-// END: CALENDAR STATIC FUNCTIONS
-
-// BEGIN: CALENDAR OBJECT FUNCTIONS
-
-/**
- * This function creates the calendar inside the given parent. If _par is
- * null than it creates a popup calendar inside the BODY element. If _par is
- * an element, be it BODY, then it creates a non-popup calendar (still
- * hidden). Some properties need to be set before calling this function.
- */
-Calendar.prototype.create = function (_par) {
- var parent = null;
- if (! _par) {
- // default parent is the document body, in which case we create
- // a popup calendar.
- parent = document.getElementsByTagName("body")[0];
- this.isPopup = true;
- } else {
- parent = _par;
- this.isPopup = false;
- }
- this.date = this.dateStr ? new Date(this.dateStr) : new Date();
-
- var table = Calendar.createElement("table");
- this.table = table;
- table.cellSpacing = 0;
- table.cellPadding = 0;
- table.calendar = this;
- Calendar.addEvent(table, "mousedown", Calendar.tableMouseDown);
-
- var div = Calendar.createElement("div");
- this.element = div;
- div.className = "calendar";
- if (this.isPopup) {
- div.style.position = "absolute";
- div.style.display = "none";
- }
- div.appendChild(table);
-
- var thead = Calendar.createElement("thead", table);
- var cell = null;
- var row = null;
-
- var cal = this;
- var hh = function (text, cs, navtype) {
- cell = Calendar.createElement("td", row);
- cell.colSpan = cs;
- cell.className = "button";
- if (navtype != 0 && Math.abs(navtype) <= 2)
- cell.className += " nav";
- Calendar._add_evs(cell);
- cell.calendar = cal;
- cell.navtype = navtype;
- cell.innerHTML = "<div unselectable='on'>" + text + "</div>";
- return cell;
- };
-
- row = Calendar.createElement("tr", thead);
- var title_length = 6;
- (this.isPopup) && --title_length;
- (this.weekNumbers) && ++title_length;
-
- hh("?", 1, 400).ttip = Calendar._TT["INFO"];
- this.title = hh("", title_length, 300);
- this.title.className = "title";
- if (this.isPopup) {
- this.title.ttip = Calendar._TT["DRAG_TO_MOVE"];
- this.title.style.cursor = "move";
- hh("×", 1, 200).ttip = Calendar._TT["CLOSE"];
- }
-
- row = Calendar.createElement("tr", thead);
- row.className = "headrow";
-
- this._nav_py = hh("«", 1, -2);
- this._nav_py.ttip = Calendar._TT["PREV_YEAR"];
-
- this._nav_pm = hh("‹", 1, -1);
- this._nav_pm.ttip = Calendar._TT["PREV_MONTH"];
-
- this._nav_now = hh(Calendar._TT["TODAY"], this.weekNumbers ? 4 : 3, 0);
- this._nav_now.ttip = Calendar._TT["GO_TODAY"];
-
- this._nav_nm = hh("›", 1, 1);
- this._nav_nm.ttip = Calendar._TT["NEXT_MONTH"];
-
- this._nav_ny = hh("»", 1, 2);
- this._nav_ny.ttip = Calendar._TT["NEXT_YEAR"];
-
- // day names
- row = Calendar.createElement("tr", thead);
- row.className = "daynames";
- if (this.weekNumbers) {
- cell = Calendar.createElement("td", row);
- cell.className = "name wn";
- cell.innerHTML = Calendar._TT["WK"];
- }
- for (var i = 7; i > 0; --i) {
- cell = Calendar.createElement("td", row);
- if (!i) {
- cell.navtype = 100;
- cell.calendar = this;
- Calendar._add_evs(cell);
- }
- }
- this.firstdayname = (this.weekNumbers) ? row.firstChild.nextSibling : row.firstChild;
- this._displayWeekdays();
-
- var tbody = Calendar.createElement("tbody", table);
- this.tbody = tbody;
-
- for (i = 6; i > 0; --i) {
- row = Calendar.createElement("tr", tbody);
- if (this.weekNumbers) {
- cell = Calendar.createElement("td", row);
- }
- for (var j = 7; j > 0; --j) {
- cell = Calendar.createElement("td", row);
- cell.calendar = this;
- Calendar._add_evs(cell);
- }
- }
-
- if (this.showsTime) {
- row = Calendar.createElement("tr", tbody);
- row.className = "time";
-
- cell = Calendar.createElement("td", row);
- cell.className = "time";
- cell.colSpan = 2;
- cell.innerHTML = Calendar._TT["TIME"] || " ";
-
- cell = Calendar.createElement("td", row);
- cell.className = "time";
- cell.colSpan = this.weekNumbers ? 4 : 3;
-
- (function(){
- function makeTimePart(className, init, range_start, range_end) {
- var part = Calendar.createElement("span", cell);
- part.className = className;
- part.innerHTML = init;
- part.calendar = cal;
- part.ttip = Calendar._TT["TIME_PART"];
- part.navtype = 50;
- part._range = [];
- if (typeof range_start != "number")
- part._range = range_start;
- else {
- for (var i = range_start; i <= range_end; ++i) {
- var txt;
- if (i < 10 && range_end >= 10) txt = '0' + i;
- else txt = '' + i;
- part._range[part._range.length] = txt;
- }
- }
- Calendar._add_evs(part);
- return part;
- };
- var hrs = cal.date.getHours();
- var mins = cal.date.getMinutes();
- var t12 = !cal.time24;
- var pm = (hrs > 12);
- if (t12 && pm) hrs -= 12;
- var H = makeTimePart("hour", hrs, t12 ? 1 : 0, t12 ? 12 : 23);
- var span = Calendar.createElement("span", cell);
- span.innerHTML = ":";
- span.className = "colon";
- var M = makeTimePart("minute", mins, 0, 59);
- var AP = null;
- cell = Calendar.createElement("td", row);
- cell.className = "time";
- cell.colSpan = 2;
- if (t12)
- AP = makeTimePart("ampm", pm ? "pm" : "am", ["am", "pm"]);
- else
- cell.innerHTML = " ";
-
- cal.onSetTime = function() {
- var pm, hrs = this.date.getHours(),
- mins = this.date.getMinutes();
- if (t12) {
- pm = (hrs >= 12);
- if (pm) hrs -= 12;
- if (hrs == 0) hrs = 12;
- AP.innerHTML = pm ? "pm" : "am";
- }
- H.innerHTML = (hrs < 10) ? ("0" + hrs) : hrs;
- M.innerHTML = (mins < 10) ? ("0" + mins) : mins;
- };
-
- cal.onUpdateTime = function() {
- var date = this.date;
- var h = parseInt(H.innerHTML, 10);
- if (t12) {
- if (/pm/i.test(AP.innerHTML) && h < 12)
- h += 12;
- else if (/am/i.test(AP.innerHTML) && h == 12)
- h = 0;
- }
- var d = date.getDate();
- var m = date.getMonth();
- var y = date.getFullYear();
- date.setHours(h);
- date.setMinutes(parseInt(M.innerHTML, 10));
- date.setFullYear(y);
- date.setMonth(m);
- date.setDate(d);
- this.dateClicked = false;
- this.callHandler();
- };
- })();
- } else {
- this.onSetTime = this.onUpdateTime = function() {};
- }
-
- var tfoot = Calendar.createElement("tfoot", table);
-
- row = Calendar.createElement("tr", tfoot);
- row.className = "footrow";
-
- cell = hh(Calendar._TT["SEL_DATE"], this.weekNumbers ? 8 : 7, 300);
- cell.className = "ttip";
- if (this.isPopup) {
- cell.ttip = Calendar._TT["DRAG_TO_MOVE"];
- cell.style.cursor = "move";
- }
- this.tooltips = cell;
-
- div = Calendar.createElement("div", this.element);
- this.monthsCombo = div;
- div.className = "combo";
- for (i = 0; i < Calendar._MN.length; ++i) {
- var mn = Calendar.createElement("div");
- mn.className = Calendar.is_ie ? "label-IEfix" : "label";
- mn.month = i;
- mn.innerHTML = Calendar._SMN[i];
- div.appendChild(mn);
- }
-
- div = Calendar.createElement("div", this.element);
- this.yearsCombo = div;
- div.className = "combo";
- for (i = 12; i > 0; --i) {
- var yr = Calendar.createElement("div");
- yr.className = Calendar.is_ie ? "label-IEfix" : "label";
- div.appendChild(yr);
- }
-
- this._init(this.firstDayOfWeek, this.date);
- parent.appendChild(this.element);
-};
-
-/** keyboard navigation, only for popup calendars */
-Calendar._keyEvent = function(ev) {
- var cal = window._dynarch_popupCalendar;
- if (!cal || cal.multiple)
- return false;
- (Calendar.is_ie) && (ev = window.event);
- var act = (Calendar.is_ie || ev.type == "keypress"),
- K = ev.keyCode;
- if (ev.ctrlKey) {
- switch (K) {
- case 37: // KEY left
- act && Calendar.cellClick(cal._nav_pm);
- break;
- case 38: // KEY up
- act && Calendar.cellClick(cal._nav_py);
- break;
- case 39: // KEY right
- act && Calendar.cellClick(cal._nav_nm);
- break;
- case 40: // KEY down
- act && Calendar.cellClick(cal._nav_ny);
- break;
- default:
- return false;
- }
- } else switch (K) {
- case 32: // KEY space (now)
- Calendar.cellClick(cal._nav_now);
- break;
- case 27: // KEY esc
- act && cal.callCloseHandler();
- break;
- case 37: // KEY left
- case 38: // KEY up
- case 39: // KEY right
- case 40: // KEY down
- if (act) {
- var prev, x, y, ne, el, step;
- prev = K == 37 || K == 38;
- step = (K == 37 || K == 39) ? 1 : 7;
- function setVars() {
- el = cal.currentDateEl;
- var p = el.pos;
- x = p & 15;
- y = p >> 4;
- ne = cal.ar_days[y][x];
- };setVars();
- function prevMonth() {
- var date = new Date(cal.date);
- date.setDate(date.getDate() - step);
- cal.setDate(date);
- };
- function nextMonth() {
- var date = new Date(cal.date);
- date.setDate(date.getDate() + step);
- cal.setDate(date);
- };
- while (1) {
- switch (K) {
- case 37: // KEY left
- if (--x >= 0)
- ne = cal.ar_days[y][x];
- else {
- x = 6;
- K = 38;
- continue;
- }
- break;
- case 38: // KEY up
- if (--y >= 0)
- ne = cal.ar_days[y][x];
- else {
- prevMonth();
- setVars();
- }
- break;
- case 39: // KEY right
- if (++x < 7)
- ne = cal.ar_days[y][x];
- else {
- x = 0;
- K = 40;
- continue;
- }
- break;
- case 40: // KEY down
- if (++y < cal.ar_days.length)
- ne = cal.ar_days[y][x];
- else {
- nextMonth();
- setVars();
- }
- break;
- }
- break;
- }
- if (ne) {
- if (!ne.disabled)
- Calendar.cellClick(ne);
- else if (prev)
- prevMonth();
- else
- nextMonth();
- }
- }
- break;
- case 13: // KEY enter
- if (act)
- Calendar.cellClick(cal.currentDateEl, ev);
- break;
- default:
- return false;
- }
- return Calendar.stopEvent(ev);
-};
-
-/**
- * (RE)Initializes the calendar to the given date and firstDayOfWeek
- */
-Calendar.prototype._init = function (firstDayOfWeek, date) {
- var today = new Date(),
- TY = today.getFullYear(),
- TM = today.getMonth(),
- TD = today.getDate();
- this.table.style.visibility = "hidden";
- var year = date.getFullYear();
- if (year < this.minYear) {
- year = this.minYear;
- date.setFullYear(year);
- } else if (year > this.maxYear) {
- year = this.maxYear;
- date.setFullYear(year);
- }
- this.firstDayOfWeek = firstDayOfWeek;
- this.date = new Date(date);
- var month = date.getMonth();
- var mday = date.getDate();
- var no_days = date.getMonthDays();
-
- // calendar voodoo for computing the first day that would actually be
- // displayed in the calendar, even if it's from the previous month.
- // WARNING: this is magic. ;-)
- date.setDate(1);
- var day1 = (date.getDay() - this.firstDayOfWeek) % 7;
- if (day1 < 0)
- day1 += 7;
- date.setDate(-day1);
- date.setDate(date.getDate() + 1);
-
- var row = this.tbody.firstChild;
- var MN = Calendar._SMN[month];
- var ar_days = this.ar_days = new Array();
- var weekend = Calendar._TT["WEEKEND"];
- var dates = this.multiple ? (this.datesCells = {}) : null;
- for (var i = 0; i < 6; ++i, row = row.nextSibling) {
- var cell = row.firstChild;
- if (this.weekNumbers) {
- cell.className = "day wn";
- cell.innerHTML = date.getWeekNumber();
- cell = cell.nextSibling;
- }
- row.className = "daysrow";
- var hasdays = false, iday, dpos = ar_days[i] = [];
- for (var j = 0; j < 7; ++j, cell = cell.nextSibling, date.setDate(iday + 1)) {
- iday = date.getDate();
- var wday = date.getDay();
- cell.className = "day";
- cell.pos = i << 4 | j;
- dpos[j] = cell;
- var current_month = (date.getMonth() == month);
- if (!current_month) {
- if (this.showsOtherMonths) {
- cell.className += " othermonth";
- cell.otherMonth = true;
- } else {
- cell.className = "emptycell";
- cell.innerHTML = " ";
- cell.disabled = true;
- continue;
- }
- } else {
- cell.otherMonth = false;
- hasdays = true;
- }
- cell.disabled = false;
- cell.innerHTML = this.getDateText ? this.getDateText(date, iday) : iday;
- if (dates)
- dates[date.print("%Y%m%d")] = cell;
- if (this.getDateStatus) {
- var status = this.getDateStatus(date, year, month, iday);
- if (this.getDateToolTip) {
- var toolTip = this.getDateToolTip(date, year, month, iday);
- if (toolTip)
- cell.title = toolTip;
- }
- if (status === true) {
- cell.className += " disabled";
- cell.disabled = true;
- } else {
- if (/disabled/i.test(status))
- cell.disabled = true;
- cell.className += " " + status;
- }
- }
- if (!cell.disabled) {
- cell.caldate = new Date(date);
- cell.ttip = "_";
- if (!this.multiple && current_month
- && iday == mday && this.hiliteToday) {
- cell.className += " selected";
- this.currentDateEl = cell;
- }
- if (date.getFullYear() == TY &&
- date.getMonth() == TM &&
- iday == TD) {
- cell.className += " today";
- cell.ttip += Calendar._TT["PART_TODAY"];
- }
- if (weekend.indexOf(wday.toString()) != -1)
- cell.className += cell.otherMonth ? " oweekend" : " weekend";
- }
- }
- if (!(hasdays || this.showsOtherMonths))
- row.className = "emptyrow";
- }
- this.title.innerHTML = Calendar._MN[month] + ", " + year;
- this.onSetTime();
- this.table.style.visibility = "visible";
- this._initMultipleDates();
- // PROFILE
- // this.tooltips.innerHTML = "Generated in " + ((new Date()) - today) + " ms";
-};
-
-Calendar.prototype._initMultipleDates = function() {
- if (this.multiple) {
- for (var i in this.multiple) {
- var cell = this.datesCells[i];
- var d = this.multiple[i];
- if (!d)
- continue;
- if (cell)
- cell.className += " selected";
- }
- }
-};
-
-Calendar.prototype._toggleMultipleDate = function(date) {
- if (this.multiple) {
- var ds = date.print("%Y%m%d");
- var cell = this.datesCells[ds];
- if (cell) {
- var d = this.multiple[ds];
- if (!d) {
- Calendar.addClass(cell, "selected");
- this.multiple[ds] = date;
- } else {
- Calendar.removeClass(cell, "selected");
- delete this.multiple[ds];
- }
- }
- }
-};
-
-Calendar.prototype.setDateToolTipHandler = function (unaryFunction) {
- this.getDateToolTip = unaryFunction;
-};
-
-/**
- * Calls _init function above for going to a certain date (but only if the
- * date is different than the currently selected one).
- */
-Calendar.prototype.setDate = function (date) {
- if (!date.equalsTo(this.date)) {
- this._init(this.firstDayOfWeek, date);
- }
-};
-
-/**
- * Refreshes the calendar. Useful if the "disabledHandler" function is
- * dynamic, meaning that the list of disabled date can change at runtime.
- * Just * call this function if you think that the list of disabled dates
- * should * change.
- */
-Calendar.prototype.refresh = function () {
- this._init(this.firstDayOfWeek, this.date);
-};
-
-/** Modifies the "firstDayOfWeek" parameter (pass 0 for Synday, 1 for Monday, etc.). */
-Calendar.prototype.setFirstDayOfWeek = function (firstDayOfWeek) {
- this._init(firstDayOfWeek, this.date);
- this._displayWeekdays();
-};
-
-/**
- * Allows customization of what dates are enabled. The "unaryFunction"
- * parameter must be a function object that receives the date (as a JS Date
- * object) and returns a boolean value. If the returned value is true then
- * the passed date will be marked as disabled.
- */
-Calendar.prototype.setDateStatusHandler = Calendar.prototype.setDisabledHandler = function (unaryFunction) {
- this.getDateStatus = unaryFunction;
-};
-
-/** Customization of allowed year range for the calendar. */
-Calendar.prototype.setRange = function (a, z) {
- this.minYear = a;
- this.maxYear = z;
-};
-
-/** Calls the first user handler (selectedHandler). */
-Calendar.prototype.callHandler = function () {
- if (this.onSelected) {
- this.onSelected(this, this.date.print(this.dateFormat));
- }
-};
-
-/** Calls the second user handler (closeHandler). */
-Calendar.prototype.callCloseHandler = function () {
- if (this.onClose) {
- this.onClose(this);
- }
- this.hideShowCovered();
-};
-
-/** Removes the calendar object from the DOM tree and destroys it. */
-Calendar.prototype.destroy = function () {
- var el = this.element.parentNode;
- el.removeChild(this.element);
- Calendar._C = null;
- window._dynarch_popupCalendar = null;
-};
-
-/**
- * Moves the calendar element to a different section in the DOM tree (changes
- * its parent).
- */
-Calendar.prototype.reparent = function (new_parent) {
- var el = this.element;
- el.parentNode.removeChild(el);
- new_parent.appendChild(el);
-};
-
-// This gets called when the user presses a mouse button anywhere in the
-// document, if the calendar is shown. If the click was outside the open
-// calendar this function closes it.
-Calendar._checkCalendar = function(ev) {
- var calendar = window._dynarch_popupCalendar;
- if (!calendar) {
- return false;
- }
- var el = Calendar.is_ie ? Calendar.getElement(ev) : Calendar.getTargetElement(ev);
- for (; el != null && el != calendar.element; el = el.parentNode);
- if (el == null) {
- // calls closeHandler which should hide the calendar.
- window._dynarch_popupCalendar.callCloseHandler();
- return Calendar.stopEvent(ev);
- }
-};
-
-/** Shows the calendar. */
-Calendar.prototype.show = function () {
- var rows = this.table.getElementsByTagName("tr");
- for (var i = rows.length; i > 0;) {
- var row = rows[--i];
- Calendar.removeClass(row, "rowhilite");
- var cells = row.getElementsByTagName("td");
- for (var j = cells.length; j > 0;) {
- var cell = cells[--j];
- Calendar.removeClass(cell, "hilite");
- Calendar.removeClass(cell, "active");
- }
- }
- this.element.style.display = "block";
- this.hidden = false;
- if (this.isPopup) {
- window._dynarch_popupCalendar = this;
- Calendar.addEvent(document, "keydown", Calendar._keyEvent);
- Calendar.addEvent(document, "keypress", Calendar._keyEvent);
- Calendar.addEvent(document, "mousedown", Calendar._checkCalendar);
- }
- this.hideShowCovered();
-};
-
-/**
- * Hides the calendar. Also removes any "hilite" from the class of any TD
- * element.
- */
-Calendar.prototype.hide = function () {
- if (this.isPopup) {
- Calendar.removeEvent(document, "keydown", Calendar._keyEvent);
- Calendar.removeEvent(document, "keypress", Calendar._keyEvent);
- Calendar.removeEvent(document, "mousedown", Calendar._checkCalendar);
- }
- this.element.style.display = "none";
- this.hidden = true;
- this.hideShowCovered();
-};
-
-/**
- * Shows the calendar at a given absolute position (beware that, depending on
- * the calendar element style -- position property -- this might be relative
- * to the parent's containing rectangle).
- */
-Calendar.prototype.showAt = function (x, y) {
- var s = this.element.style;
- s.left = x + "px";
- s.top = y + "px";
- this.show();
-};
-
-/** Shows the calendar near a given element. */
-Calendar.prototype.showAtElement = function (el, opts) {
- var self = this;
- var p = Calendar.getAbsolutePos(el);
- if (!opts || typeof opts != "string") {
- this.showAt(p.x, p.y + el.offsetHeight);
- return true;
- }
- function fixPosition(box) {
- if (box.x < 0)
- box.x = 0;
- if (box.y < 0)
- box.y = 0;
- var cp = document.createElement("div");
- var s = cp.style;
- s.position = "absolute";
- s.right = s.bottom = s.width = s.height = "0px";
- document.body.appendChild(cp);
- var br = Calendar.getAbsolutePos(cp);
- document.body.removeChild(cp);
- if (Calendar.is_ie) {
- br.y += document.body.scrollTop;
- br.x += document.body.scrollLeft;
- } else {
- br.y += window.scrollY;
- br.x += window.scrollX;
- }
- var tmp = box.x + box.width - br.x;
- if (tmp > 0) box.x -= tmp;
- tmp = box.y + box.height - br.y;
- if (tmp > 0) box.y -= tmp;
- };
- this.element.style.display = "block";
- Calendar.continuation_for_the_fucking_khtml_browser = function() {
- var w = self.element.offsetWidth;
- var h = self.element.offsetHeight;
- self.element.style.display = "none";
- var valign = opts.substr(0, 1);
- var halign = "l";
- if (opts.length > 1) {
- halign = opts.substr(1, 1);
- }
- // vertical alignment
- switch (valign) {
- case "T": p.y -= h; break;
- case "B": p.y += el.offsetHeight; break;
- case "C": p.y += (el.offsetHeight - h) / 2; break;
- case "t": p.y += el.offsetHeight - h; break;
- case "b": break; // already there
- }
- // horizontal alignment
- switch (halign) {
- case "L": p.x -= w; break;
- case "R": p.x += el.offsetWidth; break;
- case "C": p.x += (el.offsetWidth - w) / 2; break;
- case "l": p.x += el.offsetWidth - w; break;
- case "r": break; // already there
- }
- p.width = w;
- p.height = h + 40;
- self.monthsCombo.style.display = "none";
- fixPosition(p);
- self.showAt(p.x, p.y);
- };
- if (Calendar.is_khtml)
- setTimeout("Calendar.continuation_for_the_fucking_khtml_browser()", 10);
- else
- Calendar.continuation_for_the_fucking_khtml_browser();
-};
-
-/** Customizes the date format. */
-Calendar.prototype.setDateFormat = function (str) {
- this.dateFormat = str;
-};
-
-/** Customizes the tooltip date format. */
-Calendar.prototype.setTtDateFormat = function (str) {
- this.ttDateFormat = str;
-};
-
-/**
- * Tries to identify the date represented in a string. If successful it also
- * calls this.setDate which moves the calendar to the given date.
- */
-Calendar.prototype.parseDate = function(str, fmt) {
- if (!fmt)
- fmt = this.dateFormat;
- this.setDate(Date.parseDate(str, fmt));
-};
-
-Calendar.prototype.hideShowCovered = function () {
- if (!Calendar.is_ie && !Calendar.is_opera)
- return;
- function getVisib(obj){
- var value = obj.style.visibility;
- if (!value) {
- if (document.defaultView && typeof (document.defaultView.getComputedStyle) == "function") { // Gecko, W3C
- if (!Calendar.is_khtml)
- value = document.defaultView.
- getComputedStyle(obj, "").getPropertyValue("visibility");
- else
- value = '';
- } else if (obj.currentStyle) { // IE
- value = obj.currentStyle.visibility;
- } else
- value = '';
- }
- return value;
- };
-
- var tags = new Array("applet", "iframe", "select");
- var el = this.element;
-
- var p = Calendar.getAbsolutePos(el);
- var EX1 = p.x;
- var EX2 = el.offsetWidth + EX1;
- var EY1 = p.y;
- var EY2 = el.offsetHeight + EY1;
-
- for (var k = tags.length; k > 0; ) {
- var ar = document.getElementsByTagName(tags[--k]);
- var cc = null;
-
- for (var i = ar.length; i > 0;) {
- cc = ar[--i];
-
- p = Calendar.getAbsolutePos(cc);
- var CX1 = p.x;
- var CX2 = cc.offsetWidth + CX1;
- var CY1 = p.y;
- var CY2 = cc.offsetHeight + CY1;
-
- if (this.hidden || (CX1 > EX2) || (CX2 < EX1) || (CY1 > EY2) || (CY2 < EY1)) {
- if (!cc.__msh_save_visibility) {
- cc.__msh_save_visibility = getVisib(cc);
- }
- cc.style.visibility = cc.__msh_save_visibility;
- } else {
- if (!cc.__msh_save_visibility) {
- cc.__msh_save_visibility = getVisib(cc);
- }
- cc.style.visibility = "hidden";
- }
- }
- }
-};
-
-/** Internal function; it displays the bar with the names of the weekday. */
-Calendar.prototype._displayWeekdays = function () {
- var fdow = this.firstDayOfWeek;
- var cell = this.firstdayname;
- var weekend = Calendar._TT["WEEKEND"];
- for (var i = 0; i < 7; ++i) {
- cell.className = "day name";
- var realday = (i + fdow) % 7;
- if (i) {
- cell.ttip = Calendar._TT["DAY_FIRST"].replace("%s", Calendar._DN[realday]);
- cell.navtype = 100;
- cell.calendar = this;
- cell.fdow = realday;
- Calendar._add_evs(cell);
- }
- if (weekend.indexOf(realday.toString()) != -1) {
- Calendar.addClass(cell, "weekend");
- }
- cell.innerHTML = Calendar._SDN[(i + fdow) % 7];
- cell = cell.nextSibling;
- }
-};
-
-/** Internal function. Hides all combo boxes that might be displayed. */
-Calendar.prototype._hideCombos = function () {
- this.monthsCombo.style.display = "none";
- this.yearsCombo.style.display = "none";
-};
-
-/** Internal function. Starts dragging the element. */
-Calendar.prototype._dragStart = function (ev) {
- if (this.dragging) {
- return;
- }
- this.dragging = true;
- var posX;
- var posY;
- if (Calendar.is_ie) {
- posY = window.event.clientY + document.body.scrollTop;
- posX = window.event.clientX + document.body.scrollLeft;
- } else {
- posY = ev.clientY + window.scrollY;
- posX = ev.clientX + window.scrollX;
- }
- var st = this.element.style;
- this.xOffs = posX - parseInt(st.left);
- this.yOffs = posY - parseInt(st.top);
- with (Calendar) {
- addEvent(document, "mousemove", calDragIt);
- addEvent(document, "mouseup", calDragEnd);
- }
-};
-
-// BEGIN: DATE OBJECT PATCHES
-
-/** Adds the number of days array to the Date object. */
-Date._MD = new Array(31,28,31,30,31,30,31,31,30,31,30,31);
-
-/** Constants used for time computations */
-Date.SECOND = 1000 /* milliseconds */;
-Date.MINUTE = 60 * Date.SECOND;
-Date.HOUR = 60 * Date.MINUTE;
-Date.DAY = 24 * Date.HOUR;
-Date.WEEK = 7 * Date.DAY;
-
-Date.parseDate = function(str, fmt) {
- var today = new Date();
- var y = 0;
- var m = -1;
- var d = 0;
- var a = str.split(/\W+/);
- var b = fmt.match(/%./g);
- var i = 0, j = 0;
- var hr = 0;
- var min = 0;
- for (i = 0; i < a.length; ++i) {
- if (!a[i])
- continue;
- switch (b[i]) {
- case "%d":
- case "%e":
- d = parseInt(a[i], 10);
- break;
-
- case "%m":
- m = parseInt(a[i], 10) - 1;
- break;
-
- case "%Y":
- case "%y":
- y = parseInt(a[i], 10);
- (y < 100) && (y += (y > 29) ? 1900 : 2000);
- break;
-
- case "%b":
- case "%B":
- for (j = 0; j < 12; ++j) {
- if (Calendar._MN[j].substr(0, a[i].length).toLowerCase() == a[i].toLowerCase()) { m = j; break; }
- }
- break;
-
- case "%H":
- case "%I":
- case "%k":
- case "%l":
- hr = parseInt(a[i], 10);
- break;
-
- case "%P":
- case "%p":
- if (/pm/i.test(a[i]) && hr < 12)
- hr += 12;
- else if (/am/i.test(a[i]) && hr >= 12)
- hr -= 12;
- break;
-
- case "%M":
- min = parseInt(a[i], 10);
- break;
- }
- }
- if (isNaN(y)) y = today.getFullYear();
- if (isNaN(m)) m = today.getMonth();
- if (isNaN(d)) d = today.getDate();
- if (isNaN(hr)) hr = today.getHours();
- if (isNaN(min)) min = today.getMinutes();
- if (y != 0 && m != -1 && d != 0)
- return new Date(y, m, d, hr, min, 0);
- y = 0; m = -1; d = 0;
- for (i = 0; i < a.length; ++i) {
- if (a[i].search(/[a-zA-Z]+/) != -1) {
- var t = -1;
- for (j = 0; j < 12; ++j) {
- if (Calendar._MN[j].substr(0, a[i].length).toLowerCase() == a[i].toLowerCase()) { t = j; break; }
- }
- if (t != -1) {
- if (m != -1) {
- d = m+1;
- }
- m = t;
- }
- } else if (parseInt(a[i], 10) <= 12 && m == -1) {
- m = a[i]-1;
- } else if (parseInt(a[i], 10) > 31 && y == 0) {
- y = parseInt(a[i], 10);
- (y < 100) && (y += (y > 29) ? 1900 : 2000);
- } else if (d == 0) {
- d = a[i];
- }
- }
- if (y == 0)
- y = today.getFullYear();
- if (m != -1 && d != 0)
- return new Date(y, m, d, hr, min, 0);
- return today;
-};
-
-/** Returns the number of days in the current month */
-Date.prototype.getMonthDays = function(month) {
- var year = this.getFullYear();
- if (typeof month == "undefined") {
- month = this.getMonth();
- }
- if (((0 == (year%4)) && ( (0 != (year%100)) || (0 == (year%400)))) && month == 1) {
- return 29;
- } else {
- return Date._MD[month];
- }
-};
-
-/** Returns the number of day in the year. */
-Date.prototype.getDayOfYear = function() {
- var now = new Date(this.getFullYear(), this.getMonth(), this.getDate(), 0, 0, 0);
- var then = new Date(this.getFullYear(), 0, 0, 0, 0, 0);
- var time = now - then;
- return Math.floor(time / Date.DAY);
-};
-
-/** Returns the number of the week in year, as defined in ISO 8601. */
-Date.prototype.getWeekNumber = function() {
- var d = new Date(this.getFullYear(), this.getMonth(), this.getDate(), 0, 0, 0);
- var DoW = d.getDay();
- d.setDate(d.getDate() - (DoW + 6) % 7 + 3); // Nearest Thu
- var ms = d.valueOf(); // GMT
- d.setMonth(0);
- d.setDate(4); // Thu in Week 1
- return Math.round((ms - d.valueOf()) / (7 * 864e5)) + 1;
-};
-
-/** Checks date and time equality */
-Date.prototype.equalsTo = function(date) {
- return ((this.getFullYear() == date.getFullYear()) &&
- (this.getMonth() == date.getMonth()) &&
- (this.getDate() == date.getDate()) &&
- (this.getHours() == date.getHours()) &&
- (this.getMinutes() == date.getMinutes()));
-};
-
-/** Set only the year, month, date parts (keep existing time) */
-Date.prototype.setDateOnly = function(date) {
- var tmp = new Date(date);
- this.setDate(1);
- this.setFullYear(tmp.getFullYear());
- this.setMonth(tmp.getMonth());
- this.setDate(tmp.getDate());
-};
-
-/** Prints the date in a string according to the given format. */
-Date.prototype.print = function (str) {
- var m = this.getMonth();
- var d = this.getDate();
- var y = this.getFullYear();
- var wn = this.getWeekNumber();
- var w = this.getDay();
- var s = {};
- var hr = this.getHours();
- var pm = (hr >= 12);
- var ir = (pm) ? (hr - 12) : hr;
- var dy = this.getDayOfYear();
- if (ir == 0)
- ir = 12;
- var min = this.getMinutes();
- var sec = this.getSeconds();
- s["%a"] = Calendar._SDN[w]; // abbreviated weekday name [FIXME: I18N]
- s["%A"] = Calendar._DN[w]; // full weekday name
- s["%b"] = Calendar._SMN[m]; // abbreviated month name [FIXME: I18N]
- s["%B"] = Calendar._MN[m]; // full month name
- // FIXME: %c : preferred date and time representation for the current locale
- s["%C"] = 1 + Math.floor(y / 100); // the century number
- s["%d"] = (d < 10) ? ("0" + d) : d; // the day of the month (range 01 to 31)
- s["%e"] = d; // the day of the month (range 1 to 31)
- // FIXME: %D : american date style: %m/%d/%y
- // FIXME: %E, %F, %G, %g, %h (man strftime)
- s["%H"] = (hr < 10) ? ("0" + hr) : hr; // hour, range 00 to 23 (24h format)
- s["%I"] = (ir < 10) ? ("0" + ir) : ir; // hour, range 01 to 12 (12h format)
- s["%j"] = (dy < 100) ? ((dy < 10) ? ("00" + dy) : ("0" + dy)) : dy; // day of the year (range 001 to 366)
- s["%k"] = hr; // hour, range 0 to 23 (24h format)
- s["%l"] = ir; // hour, range 1 to 12 (12h format)
- s["%m"] = (m < 9) ? ("0" + (1+m)) : (1+m); // month, range 01 to 12
- s["%M"] = (min < 10) ? ("0" + min) : min; // minute, range 00 to 59
- s["%n"] = "\n"; // a newline character
- s["%p"] = pm ? "PM" : "AM";
- s["%P"] = pm ? "pm" : "am";
- // FIXME: %r : the time in am/pm notation %I:%M:%S %p
- // FIXME: %R : the time in 24-hour notation %H:%M
- s["%s"] = Math.floor(this.getTime() / 1000);
- s["%S"] = (sec < 10) ? ("0" + sec) : sec; // seconds, range 00 to 59
- s["%t"] = "\t"; // a tab character
- // FIXME: %T : the time in 24-hour notation (%H:%M:%S)
- s["%U"] = s["%W"] = s["%V"] = (wn < 10) ? ("0" + wn) : wn;
- s["%u"] = w + 1; // the day of the week (range 1 to 7, 1 = MON)
- s["%w"] = w; // the day of the week (range 0 to 6, 0 = SUN)
- // FIXME: %x : preferred date representation for the current locale without the time
- // FIXME: %X : preferred time representation for the current locale without the date
- s["%y"] = ('' + y).substr(2, 2); // year without the century (range 00 to 99)
- s["%Y"] = y; // year with the century
- s["%%"] = "%"; // a literal '%' character
-
- var re = /%./g;
- if (!Calendar.is_ie5 && !Calendar.is_khtml)
- return str.replace(re, function (par) { return s[par] || par; });
-
- var a = str.match(re);
- for (var i = 0; i < a.length; i++) {
- var tmp = s[a[i]];
- if (tmp) {
- re = new RegExp(a[i], 'g');
- str = str.replace(re, tmp);
- }
- }
-
- return str;
-};
-
-Date.prototype.__msh_oldSetFullYear = Date.prototype.setFullYear;
-Date.prototype.setFullYear = function(y) {
- var d = new Date(this);
- d.__msh_oldSetFullYear(y);
- if (d.getMonth() != this.getMonth())
- this.setDate(28);
- this.__msh_oldSetFullYear(y);
-};
-
-// END: DATE OBJECT PATCHES
-
-
-// global object that remembers the calendar
-window._dynarch_popupCalendar = null;
=== modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/resources/struts.xml 2010-06-01 11:04:02 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/resources/struts.xml 2010-11-19 09:27:17 +0000
@@ -42,7 +42,7 @@
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-importexport/importForm.vm</param>
<param name="menu">/dhis-web-importexport/mainMenu.vm</param>
- <param name="javascripts">javascript/import.js,javascript/process.js,../dhis-web-commons/calendar/calendar.js,../dhis-web-commons/calendar/calendar-lang.js,../dhis-web-commons/calendar/calendar-setup.js</param>
+ <param name="javascripts">javascript/import.js,javascript/process.js</param>
</action>
<action name="import" class="org.hisp.dhis.importexport.action.imp.ImportAction">
@@ -140,7 +140,7 @@
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-importexport/exportDataValueForm.vm</param>
<param name="menu">/dhis-web-importexport/mainMenu.vm</param>
- <param name="javascripts">../dhis-web-commons/oust/oust.js,../dhis-web-commons/calendar/calendar.js,../dhis-web-commons/calendar/calendar-lang.js,../dhis-web-commons/calendar/calendar-setup.js,javascript/export.js</param>
+ <param name="javascripts">../dhis-web-commons/oust/oust.js,javascript/export.js</param>
</action>
<action name="exportMetaData" class="org.hisp.dhis.importexport.action.exp.MetaDataExportAction">
=== modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/importForm.vm'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/importForm.vm 2010-02-27 21:18:45 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/importForm.vm 2010-11-19 09:27:17 +0000
@@ -35,16 +35,13 @@
<th>$i18n.getString( "last_updated_leave_blank_for_all" )</th>
</tr>
<tr>
- <td><input type="text" id="lastUpdated" name="lastUpdated" style="width:250px">
- <img src="../images/calendar_icon.gif" width="16" height="16" id="getLastUpdated" cursor: pointer;" title="$i18n.getString( "date_selector" )" onmouseover="this.style.background='orange';" onmouseout="this.style.background=''"></td>
+ <td><input type="text" id="lastUpdated" name="lastUpdated" style="width:250px"></td>
</tr>
<script type="text/javascript">
- Calendar.setup({
- inputField : "lastUpdated", // id of the input field
- ifFormat : "$i18n.getString("format.date.label")", // format of the input field
- button : "getLastUpdated" // trigger for the calendar (button ID)
- });
+ jQuery(function(){
+ datePicker( 'lastUpdated' );
+ });
</script>
#else
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addExtendedDataElementForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addExtendedDataElementForm.vm 2010-09-25 20:13:04 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addExtendedDataElementForm.vm 2010-11-19 09:27:17 +0000
@@ -5,7 +5,7 @@
});
</script>
-<input type="hidden" id="curLocaleCode" value="$locale.getLanguage()_$locale.getCountry()"/>
+
<h3>$i18n.getString( "create_new_data_element" )</h3>
<form id="addExtendedDataElementForm" action="addExtendedDataElement.action" method="post" onsubmit="return validateAddExtendedDataElement()">
@@ -89,16 +89,13 @@
</tr>
<tr>
<td><label for="statusDate">$i18n.getString( "status_date" ) ($i18n.getString( "format.date.label" ))</label></td>
- <td><input type="text" id="statusDate" name="statusDate" style="width:20em" class="{validate:{dateISO:true}}"/></td>
- <td><img src="../images/calendar_icon.gif" width="16" height="16" id="getStatusDate" style="cursor: pointer;" title="$i18n.getString( 'date_selector' )" onmouseover="this.style.background='orange';" onmouseout="this.style.background=''" alt="$i18n.getString( 'status_date' )"/></td>
+ <td><input type="text" id="statusDate" name="statusDate" style="width:20em" class="{validate:{dateISO:true}}"/></td>
</tr>
<script type="text/javascript">
- Calendar.setup({
- inputField : "statusDate", // id of the input field
- ifFormat : "$i18n.getString("format.date.label")", // format of the input field
- button : "getStatusDate" // trigger for the calendar (button ID)
- });
+ jQuery(function(){
+ datePicker( 'statusDate' );
+ });
</script>
<tr>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addExtendedIndicatorForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addExtendedIndicatorForm.vm 2010-09-20 10:52:38 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addExtendedIndicatorForm.vm 2010-11-19 09:27:17 +0000
@@ -103,16 +103,13 @@
</tr>
<tr>
<td><label for="statusDate">$i18n.getString( "status_date" ) ($i18n.getString( "format.date.label" ))</label></td>
- <td><input type="text" id="statusDate" name="statusDate" style="width:20em" class="{validate:{dateISO:true}}"></td>
- <td><img src="../images/calendar_icon.gif" width="16" height="16" id="getStatusDate" style="cursor:pointer;" title="$i18n.getString( 'date_selector' )" onmouseover="this.style.background='orange';" onmouseout="this.style.background=''" alt="$i18n.getString( 'status_date' )"/></td>
+ <td><input type="text" id="statusDate" name="statusDate" style="width:20em" class="{validate:{dateISO:true}}"></td>
</tr>
<script type="text/javascript">
- Calendar.setup({
- inputField : "statusDate", // id of the input field
- ifFormat : "$i18n.getString("format.date.label")", // format of the input field
- button : "getStatusDate" // trigger for the calendar (button ID)
- });
+ jQuery(function(){
+ datePicker( 'statusDate' );
+ });
</script>
<tr>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateExtendedDataElementForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateExtendedDataElementForm.vm 2010-09-20 10:52:38 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateExtendedDataElementForm.vm 2010-11-19 09:27:17 +0000
@@ -100,16 +100,13 @@
</tr>
<tr>
<td><label for="statusDate">$i18n.getString( "status_date" ) ($i18n.getString( "format.date.label" ))</label></td>
- <td><input type="text" id="statusDate" name="statusDate" value="$!format.formatDate( $!dataElement.extended.statusDate )" style="width:20em" class="{validate:{dateISO:true}}"/></td>
- <td><img src="../images/calendar_icon.gif" width="16" height="16" id="getStatusDate" style="cursor: pointer;" title="$i18n.getString( 'date_selector' )" onmouseover="this.style.background='orange';" onmouseout="this.style.background=''" alt="$i18n.getString( 'status_date' )"/></td>
+ <td><input type="text" id="statusDate" name="statusDate" value="$!format.formatDate( $!dataElement.extended.statusDate )" style="width:20em" class="{validate:{dateISO:true}}"/></td>
</tr>
<script type="text/javascript">
- Calendar.setup({
- inputField : "statusDate", // id of the input field
- ifFormat : "$i18n.getString("format.date.label")", // format of the input field
- button : "getStatusDate" // trigger for the calendar (button ID)
- });
+ jQuery(function(){
+ datePicker( 'statusDate' );
+ });
</script>
<tr>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateExtendedIndicatorForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateExtendedIndicatorForm.vm 2010-09-20 10:52:38 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateExtendedIndicatorForm.vm 2010-11-19 09:27:17 +0000
@@ -104,16 +104,13 @@
</tr>
<tr>
<td><label for="statusDate">$i18n.getString( "status_date" ) ($i18n.getString( "format.date.label" ))</label></td>
- <td><input type="text" id="statusDate" name="statusDate" value="$!format.formatDate( $!dataElement.extended.statusDate )" style="width:20em"/></td>
- <td><img src="../images/calendar_icon.gif" width="16" height="16" id="getStatusDate" style="cursor: pointer;" title="$i18n.getString("date_selector")" onmouseover="this.style.background='orange';" onmouseout="this.style.background=''" alt="$i18n.getString( 'status_date' )"/></td>
+ <td><input type="text" id="statusDate" name="statusDate" value="$!format.formatDate( $!dataElement.extended.statusDate )" style="width:20em"/></td>
</tr>
<script type="text/javascript">
- Calendar.setup({
- inputField : "statusDate", // id of the input field
- ifFormat : "$i18n.getString("format.date.label")", // format of the input field
- button : "getStatusDate" // trigger for the calendar (button ID)
- });
+ jQuery(function(){
+ datePicker( 'statusDate' );
+ });
</script>
<tr>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/struts.xml 2010-11-16 07:37:56 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/struts.xml 2010-11-19 09:27:17 +0000
@@ -461,9 +461,6 @@
<param name="javascripts">
../dhis-web-commons/javascripts/jQuery/ui/jquery-ui.js,
../dhis-web-commons/javascripts/date.js,
- ../dhis-web-commons/calendar/calendar.js,
- ../dhis-web-commons/calendar/calendar-lang.js,
- ../dhis-web-commons/calendar/calendar-setup.js,
../dhis-web-commons/javascripts/jQuery/jquery.metadata.js,
javascript/underage.js
,javascript/commons.js
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/underAgeForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/underAgeForm.vm 2010-10-28 09:17:13 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/underAgeForm.vm 2010-11-19 09:27:17 +0000
@@ -263,12 +263,7 @@
</div>
</div>
<script>
-Calendar.setup({
- inputField : "birthDate" // id of the input field
- ,ifFormat : "$i18n.getString('format.date.label')" // format of the input field
- ,button : "getBirthDate" // trigger for the calendar (button ID)
- ,onUpdate : function(){jQuery("#birthDate").focus();}
-});
+
var i18n_patient_identifiers = '$encoder.jsEscape( $i18n.getString( "patient_identifiers" ) , "'")';
var i18n_patient_attributes = '$encoder.jsEscape( $i18n.getString( "patient_attributes" ) , "'")';
var i18n_patient_fullName = '$encoder.jsEscape( $i18n.getString( "full_name" ) , "'")';
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updatePatientAttributeValueForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updatePatientAttributeValueForm.vm 2010-03-05 13:00:37 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updatePatientAttributeValueForm.vm 2010-11-19 09:27:17 +0000
@@ -93,15 +93,12 @@
<option value="false" #if( $patientAttributeValue.value == "false" ) selected="selected" #end>$i18n.getString( "no" )</option>
</select>
#elseif( $patientAttribute.valueType == "DATE" )
- <input type="text" id="value[$patientAttribute.id].date" name="entryfield" value="$!encoder.htmlEncode( $patientAttributeValue.value )" onchange="saveDate( $patient.id, $patientAttribute.id, '$encoder.jsEncode( $patientAttribute.name )' )" tabindex="$tabIndex" >
- <img src="../images/calendar_icon.gif" width="16" height="16" id="getDateValue$patientAttribute.id" style="cursor: pointer;" title="$i18n.getString("date_selector")" onmouseover="this.style.background='orange';" onmouseout="this.style.background=''" alt="$i18n.getString( "date" )">
- <script type="text/javascript">
- Calendar.setup({
- inputField : "value[$patientAttribute.id].date", // id of the input field
- ifFormat : "$i18n.getString("format.date.label")", // format of the input field
- button : "getDateValue$patientAttribute.id" // trigger for the calendar (button ID)
- });
- </script>
+ <input type="text" id="value[$patientAttribute.id].date" name="entryfield" value="$!encoder.htmlEncode( $patientAttributeValue.value )" onchange="saveDate( $patient.id, $patientAttribute.id, '$encoder.jsEncode( $patientAttribute.name )' )" tabindex="$tabIndex" >
+ <script type="text/javascript">
+ jQuery(function(){
+ datePicker( 'value\\[$patientAttribute.id\\]\\.date' );
+ });
+ </script>
#elseif( $patientAttribute.valueType == "COMBO" )
<select name="entryselect" id="value[$patientAttribute.id].combo" name="entryfield" onchange="saveCombo( $patient.id, $patientAttribute.id, this)" tabindex="$tabIndex" >
<option value="">[$i18n.getString( "please_select" )]</option>
@@ -150,15 +147,12 @@
<option value="false" #if( $patientAttributeValue.value == "false" ) selected="selected" #end>$i18n.getString( "no" )</option>
</select>
#elseif( $patientAttribute.valueType == "DATE" )
- <input type="text" id="value[$patientAttribute.id].date" name="entryfield" value="$!encoder.htmlEncode( $patientAttributeValue.value )" onchange="saveDate( $patient.id, $patientAttribute.id, '$encoder.jsEncode( $patientAttribute.name )' )" tabindex="$tabIndex" >
- <img src="../images/calendar_icon.gif" width="16" height="16" id="getDateValue$patientAttribute.id" style="cursor: pointer;" title="$i18n.getString("date_selector")" onmouseover="this.style.background='orange';" onmouseout="this.style.background=''" alt="$i18n.getString( "date" )">
- <script type="text/javascript">
- Calendar.setup({
- inputField : "value[$patientAttribute.id].date", // id of the input field
- ifFormat : "$i18n.getString("format.date.label")", // format of the input field
- button : "getDateValue$patientAttribute.id" // trigger for the calendar (button ID)
- });
- </script>
+ <input type="text" id="value[$patientAttribute.id].date" name="entryfield" value="$!encoder.htmlEncode( $patientAttributeValue.value )" onchange="saveDate( $patient.id, $patientAttribute.id, '$encoder.jsEncode( $patientAttribute.name )' )" tabindex="$tabIndex" >
+ <script type="text/javascript">
+ jQuery(function(){
+ datePicker( 'value\\[$patientAttribute.id\\]\\.date' );
+ });
+ </script>
#elseif( $patientAttribute.valueType == "COMBO" )
<select name="entryselect" id="value[$patientAttribute.id].combo" name="entryfield" onchange="saveCombo( $patient.id, $patientAttribute.id, this )" tabindex="$tabIndex" >
<option value="">[$i18n.getString( "please_select" )]</option>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/viewDataEntryForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/viewDataEntryForm.vm 2010-10-28 09:17:13 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/viewDataEntryForm.vm 2010-11-19 09:27:17 +0000
@@ -64,6 +64,7 @@
<form id="saveDataEntryForm" name="saveDataEntryForm" action="saveDataEntryForm.action" method="post">
<input type="hidden" name="programStageId" value="$!programStageId"/>
<input type="hidden" name="associationIdField" id="associationIdField" value="$association.id" />
+<input type="hidden" name="associationid" id="associationid" value="" />
<h3>$i18n.getString( "dataentryform_management_for_program_stage" ): $association.name </h3>
<div class="container" >
<table id="detailsList" width="100%">
@@ -247,6 +248,7 @@
function openDataElementSelector()
{
+ setFieldValue( 'associationid', $association.id );
dataElementSelector.dialog("open");
}
@@ -274,6 +276,8 @@
function getProgramStageDataElements( id )
{
+ setFieldValue( 'associationid', id );
+
var dataElements = jQuery( "#otherProgramStageDataElements #dataElementIds" );
dataElements.empty();
var dataElementIdsStore = jQuery( "#otherProgramStageDataElements #dataElementIdsStore" );
@@ -329,7 +333,7 @@
}
var categoryOptionCombos = getSelectedValues( source + ' #optionComboIds' );
- var associationId = $association.id;
+ var associationId = getFieldValue( 'associationid' );
var dataElementId = dataElement.id;
var dataElementName = dataElement.name;
@@ -380,13 +384,7 @@
id = boolPSDataEntryId;
}else if (dataElementType == "date")
{
- clazz = "date_" + associationId + "_" + dataElementId;
- selectString = "<input type=\"text\" id=\"" + datePSDataEntryId + "\" name=\"entryfield\" value=\"\" class=\"" + clazz + "\">";
- selectString += "<script type=\"text/javascript\">";
- selectString += "jQuery(function(){";
- selectString += "datePickerjQuery('." + clazz + "');";
- selectString += "});";
- selectString += "<\/script>";
+ selectString = "<input type=\"text\" id=\"" + datePSDataEntryId + "\" name=\"entryfield\" value=\"\" />";
id = datePSDataEntryId;
} else if ( dataElementType == "int" )
@@ -428,7 +426,7 @@
function checkExisted( id )
-{
+{
var result = false;
var html = FCKeditorAPI.GetInstance('designTextarea').GetHTML();
var input = jQuery( html ).find("select, :text");
