dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #13779
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 4509: Merge from 2.3 to trunk mobile services
------------------------------------------------------------
revno: 4509
committer: Mithilesh Kumar Thakur<mithilesh.hisp@xxxxxxxxx>
branch nick: dhis2
timestamp: Sat 2011-09-03 16:44:13 +0530
message:
Merge from 2.3 to trunk mobile services
modified:
local/in/dhis-mobile/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/SendSMSJob.java
local/in/dhis-mobile/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/api/DefaultMobileImportService.java
local/in/dhis-mobile/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/api/MobileImportService.java
local/in/dhis-mobile/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/api/SendSMSService.java
local/in/dhis-mobile/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/api/SendSMSStore.java
local/in/dhis-mobile/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/impl/DefaultSendSMSService.java
local/in/dhis-mobile/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/impl/HibernateSendSMSStore.java
local/in/dhis-mobile/dhis-service-mobile/src/main/resources/META-INF/dhis/beans.xml
local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/deTargetAnalysisResult.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 'local/in/dhis-mobile/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/SendSMSJob.java'
--- local/in/dhis-mobile/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/SendSMSJob.java 2011-04-15 11:41:30 +0000
+++ local/in/dhis-mobile/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/SendSMSJob.java 2011-09-03 11:14:13 +0000
@@ -25,7 +25,6 @@
this.mobileImportService = mobileImportService;
}
-
// -------------------------------------------------------------------------
// Input & Output
// -------------------------------------------------------------------------
@@ -135,7 +134,7 @@
mobileImportService.importPendingFiles();
- smsService.sendDrafts();
+ //smsService.sendDrafts();
System.out.println("ImportAndSendSMSProcess Job Ended at : "+new Date() );
}
=== modified file 'local/in/dhis-mobile/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/api/DefaultMobileImportService.java'
--- local/in/dhis-mobile/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/api/DefaultMobileImportService.java 2011-07-07 11:56:37 +0000
+++ local/in/dhis-mobile/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/api/DefaultMobileImportService.java 2011-09-03 11:14:13 +0000
@@ -1,4 +1,3 @@
-
/*
* Copyright (c) 2004-2007, University of Oslo
* All rights reserved.
@@ -33,15 +32,12 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
-import java.sql.ResultSet;
-import java.sql.SQLException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Date;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -60,7 +56,6 @@
import org.hisp.dhis.datavalue.DataValueService;
import org.hisp.dhis.external.location.LocationManager;
import org.hisp.dhis.mobile.SmsService;
-import org.hisp.dhis.mobile.api.ReceiveSMSService;
import org.hisp.dhis.organisationunit.OrganisationUnit;
import org.hisp.dhis.organisationunit.OrganisationUnitService;
import org.hisp.dhis.period.DailyPeriodType;
@@ -70,12 +65,10 @@
import org.hisp.dhis.period.PeriodType;
import org.hisp.dhis.period.WeeklyPeriodType;
import org.hisp.dhis.period.YearlyPeriodType;
-import org.hisp.dhis.source.Source;
import org.hisp.dhis.user.User;
import org.hisp.dhis.user.UserCredentials;
import org.hisp.dhis.user.UserStore;
import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.core.RowMapper;
import org.springframework.jdbc.support.rowset.SqlRowSet;
import org.springframework.transaction.annotation.Transactional;
import org.w3c.dom.Document;
@@ -86,680 +79,726 @@
import org.xml.sax.SAXParseException;
public class DefaultMobileImportService
-implements MobileImportService
+ implements MobileImportService
{
- private static final Log LOG = LogFactory.getLog( DefaultMobileImportService.class );
-
- // -------------------------------------------------------------------------
- // Dependencies
- // -------------------------------------------------------------------------
-
- private SendSMSService sendSMSService;
-
- public void setSendSMSService( SendSMSService sendSMSService )
- {
- this.sendSMSService = sendSMSService;
- }
-
- private ReceiveSMSService receiveSMSService;
-
- public void setReceiveSMSService( ReceiveSMSService receiveSMSService )
- {
- this.receiveSMSService = receiveSMSService;
- }
-
- SmsService smsService;
-
- public void setSmsService( SmsService smsService )
- {
- this.smsService = smsService;
- }
-
- private JdbcTemplate jdbcTemplate;
-
- public void setJdbcTemplate( JdbcTemplate jdbcTemplate )
- {
- this.jdbcTemplate = jdbcTemplate;
- }
-
- private LocationManager locationManager;
-
- public void setLocationManager( LocationManager locationManager )
- {
- this.locationManager = locationManager;
- }
-
- private UserStore userStore;
-
- public void setUserStore( UserStore userStore )
- {
- this.userStore = userStore;
- }
-
- private PeriodService periodService;
-
- public void setPeriodService( PeriodService periodService )
- {
- this.periodService = periodService;
- }
-
- private DataElementService dataElementService;
-
- public void setDataElementService( DataElementService dataElementService )
- {
- this.dataElementService = dataElementService;
- }
-
- private DataValueService dataValueService;
-
- public void setDataValueService( DataValueService dataValueService )
- {
- this.dataValueService = dataValueService;
- }
-
- private DataElementCategoryService dataElementCategoryService;
-
- public void setDataElementCategoryService( DataElementCategoryService dataElementCategoryService )
- {
- this.dataElementCategoryService = dataElementCategoryService;
- }
-
- private OrganisationUnitService organisationUnitService;
-
- public void setOrganisationUnitService( OrganisationUnitService organisationUnitService )
- {
- this.organisationUnitService = organisationUnitService;
- }
-
- private BatchHandlerFactory batchHandlerFactory;
-
- public void setBatchHandlerFactory( BatchHandlerFactory batchHandlerFactory )
- {
- this.batchHandlerFactory = batchHandlerFactory;
- }
-
- // -------------------------------------------------------------------------
- // Parameters
- // -------------------------------------------------------------------------
-
- private String storedBy;
-
- // -------------------------------------------------------------------------
- // Services
- // -------------------------------------------------------------------------
-
- @Override
- public void readAllMessages()
- {
- smsService.readAllMessages();
- System.out.println("Message reading done");
- }
-
- @Override
- public User getUserInfo( String mobileNumber )
- {
- Collection<User> userList = userStore.getUsersByPhoneNumber( mobileNumber );
-
- User selectedUser = null;
-
- if ( userList != null && userList.size() > 0 )
- {
- selectedUser = userList.iterator().next();
- }
-
- return selectedUser;
- }
-
- @Override
- public Period getPeriodInfo( String startDate, String periodType )
+ private static final Log LOG = LogFactory.getLog( DefaultMobileImportService.class );
+
+ // -------------------------------------------------------------------------
+ // Dependencies
+ // -------------------------------------------------------------------------
+
+ private SendSMSService sendSMSService;
+
+ public void setSendSMSService( SendSMSService sendSMSService )
+ {
+ this.sendSMSService = sendSMSService;
+ }
+
+ private ReceiveSMSService receiveSMSService;
+
+ public void setReceiveSMSService( ReceiveSMSService receiveSMSService )
+ {
+ this.receiveSMSService = receiveSMSService;
+ }
+
+ SmsService smsService;
+
+ public void setSmsService( SmsService smsService )
+ {
+ this.smsService = smsService;
+ }
+
+ private JdbcTemplate jdbcTemplate;
+
+ public void setJdbcTemplate( JdbcTemplate jdbcTemplate )
+ {
+ this.jdbcTemplate = jdbcTemplate;
+ }
+
+ private LocationManager locationManager;
+
+ public void setLocationManager( LocationManager locationManager )
+ {
+ this.locationManager = locationManager;
+ }
+
+ private UserStore userStore;
+
+ public void setUserStore( UserStore userStore )
+ {
+ this.userStore = userStore;
+ }
+
+ private PeriodService periodService;
+
+ public void setPeriodService( PeriodService periodService )
+ {
+ this.periodService = periodService;
+ }
+
+ private DataElementService dataElementService;
+
+ public void setDataElementService( DataElementService dataElementService )
+ {
+ this.dataElementService = dataElementService;
+ }
+
+ private DataValueService dataValueService;
+
+ public void setDataValueService( DataValueService dataValueService )
+ {
+ this.dataValueService = dataValueService;
+ }
+
+ private DataElementCategoryService dataElementCategoryService;
+
+ public void setDataElementCategoryService( DataElementCategoryService dataElementCategoryService )
+ {
+ this.dataElementCategoryService = dataElementCategoryService;
+ }
+
+ private OrganisationUnitService organisationUnitService;
+
+ public void setOrganisationUnitService( OrganisationUnitService organisationUnitService )
+ {
+ this.organisationUnitService = organisationUnitService;
+ }
+
+ private BatchHandlerFactory batchHandlerFactory;
+
+ public void setBatchHandlerFactory( BatchHandlerFactory batchHandlerFactory )
+ {
+ this.batchHandlerFactory = batchHandlerFactory;
+ }
+
+ // -------------------------------------------------------------------------
+ // Parameters
+ // -------------------------------------------------------------------------
+
+ private String storedBy;
+
+ // -------------------------------------------------------------------------
+ // Services
+ // -------------------------------------------------------------------------
+
+ @Override
+ public void readAllMessages()
+ {
+ smsService.readAllMessages();
+ System.out.println( "Message reading done" );
+ }
+
+ @Override
+ public User getUserInfo( String mobileNumber )
+ {
+ Collection<User> userList = userStore.getUsersByPhoneNumber( mobileNumber );
+
+ User selectedUser = null;
+
+ if ( userList != null && userList.size() > 0 )
+ {
+ selectedUser = userList.iterator().next();
+ }
+
+ return selectedUser;
+ }
+
+ @Override
+ public Period getPeriodInfo( String startDate, String periodType ) throws Exception
+ {
+ SimpleDateFormat dateFormat = new SimpleDateFormat( "yyyy-MM-dd" );
+
+ List<Period> periods = null;
+ PeriodType pt = null;
+ if ( periodType.equals( "3" ) )
+ {
+ pt = new MonthlyPeriodType();
+ periods = new ArrayList<Period>( periodService.getPeriodsByPeriodType( pt ) );
+ }
+ else if ( periodType.equals( "1" ) )
+ {
+ pt = new DailyPeriodType();
+ periods = new ArrayList<Period>( periodService.getPeriodsByPeriodType( pt ) );
+ }
+ else if ( periodType.equals( "6" ) )
+ {
+ pt = new YearlyPeriodType();
+ periods = new ArrayList<Period>( periodService.getPeriodsByPeriodType( pt ) );
+ }
+ else if ( periodType.equals( "2" ) )
+ {
+ pt = new WeeklyPeriodType();
+ periods = new ArrayList<Period>( periodService.getPeriodsByPeriodType( pt ) );
+ }
+
+ for ( Period period : periods )
+ {
+ String tempDate = dateFormat.format( period.getStartDate() );
+ if ( tempDate.equalsIgnoreCase( startDate ) )
+ {
+ return period;
+ }
+ }
+
+ Period period = pt.createPeriod( dateFormat.parse( startDate ) );
+ period = reloadPeriodForceAdd( period );
+ periodService.addPeriod( period );
+
+ return period;
+ }
+
+ private final Period reloadPeriod( Period period )
+ {
+ return periodService.getPeriod( period.getStartDate(), period.getEndDate(), period.getPeriodType() );
+ }
+
+ private final Period reloadPeriodForceAdd( Period period )
+ {
+ Period storedPeriod = reloadPeriod( period );
+
+ if ( storedPeriod == null )
+ {
+ periodService.addPeriod( period );
+
+ return period;
+ }
+
+ return storedPeriod;
+ }
+
+ @Override
+ public MobileImportParameters getParametersFromXML( String fileName )
throws Exception
- {
-
- SimpleDateFormat dateFormat = new SimpleDateFormat( "yyyy-MM-dd" );
-
- List<Period> periods = null;
- PeriodType pt = null;
- if ( periodType.equals( "3" ) )
- {
- pt = new MonthlyPeriodType();
- periods = new ArrayList<Period>( periodService.getPeriodsByPeriodType( pt ) );
- }
- else if ( periodType.equals( "1" ) )
- {
- pt = new DailyPeriodType();
- periods = new ArrayList<Period>( periodService.getPeriodsByPeriodType( pt ) );
- }
- else if( periodType.equals( "6" ) )
- {
- pt = new YearlyPeriodType();
- periods = new ArrayList<Period>( periodService.getPeriodsByPeriodType( pt ) );
- }
- else if( periodType.equals( "2" ) )
- {
- pt = new WeeklyPeriodType();
- periods = new ArrayList<Period>( periodService.getPeriodsByPeriodType( pt ) );
- }
-
- for ( Period period : periods )
- {
- String tempDate = dateFormat.format( period.getStartDate() );
- if ( tempDate.equalsIgnoreCase( startDate ) )
- {
- return period;
- }
- }
-
- Period period = pt.createPeriod( dateFormat.parse( startDate ) );
- period = reloadPeriodForceAdd( period );
- periodService.addPeriod( period );
-
- return period;
- }
-
- private final Period reloadPeriod( Period period )
- {
- return periodService.getPeriod( period.getStartDate(), period.getEndDate(), period.getPeriodType() );
- }
-
- private final Period reloadPeriodForceAdd( Period period )
- {
- Period storedPeriod = reloadPeriod( period );
-
- if ( storedPeriod == null )
- {
- periodService.addPeriod( period );
-
- return period;
- }
-
- return storedPeriod;
- }
-
- @Override
- public MobileImportParameters getParametersFromXML( String fileName ) throws Exception
- {
- File importFile = locationManager.getFileForReading( fileName, "mi", "pending" );
-
- String mobileNumber;
- String smsTime;
- String startDate;
- String periodType;
- String formType;
- String anmName;
- String anmQuery;
-
- String tempDeid;
- String tempDataValue;
-
- Map<String, String> dataValues = new HashMap<String, String>();
-
- MobileImportParameters mobileImportParameters = new MobileImportParameters();
-
- try
- {
- DocumentBuilderFactory docBuilderFactory = DocumentBuilderFactory.newInstance();
- DocumentBuilder docBuilder = docBuilderFactory.newDocumentBuilder();
- Document doc = docBuilder.parse( importFile );
- if ( doc == null )
- {
- return null;
- }
-
- // To get Mobile Number
- NodeList sourceInfo = doc.getElementsByTagName( "source" );
- Element sourceInfoElement = (Element) sourceInfo.item( 0 );
- NodeList textsourceInfoNameList = sourceInfoElement.getChildNodes();
- mobileNumber = textsourceInfoNameList.item( 0 ).getNodeValue().trim();
-
- mobileImportParameters.setMobileNumber( mobileNumber );
-
- // To get Period
- NodeList periodInfo = doc.getElementsByTagName( "period" );
- Element periodInfoElement = (Element) periodInfo.item( 0 );
- NodeList textperiodInfoNameList = periodInfoElement.getChildNodes();
- startDate = textperiodInfoNameList.item( 0 ).getNodeValue().trim();
-
- mobileImportParameters.setStartDate( startDate );
-
- // To get TimeStamp
- NodeList timeStampInfo = doc.getElementsByTagName( "timeStamp" );
- Element timeStampInfoElement = (Element) timeStampInfo.item( 0 );
- NodeList texttimeStampInfoNameList = timeStampInfoElement.getChildNodes();
- smsTime = texttimeStampInfoNameList.item( 0 ).getNodeValue().trim();
-
- mobileImportParameters.setSmsTime( smsTime );
-
- // To get PeriodType
- NodeList periodTypeInfo = doc.getElementsByTagName( "periodType" );
- Element periodTypeInfoElement = (Element) periodTypeInfo.item( 0 );
- NodeList textPeriodTypeInfoNameList = periodTypeInfoElement.getChildNodes();
- periodType = textPeriodTypeInfoNameList.item( 0 ).getNodeValue().trim();
-
- mobileImportParameters.setPeriodType( periodType );
-
- // To get FormType
- NodeList formTypeInfo = doc.getElementsByTagName( "formtype" );
- Element formTypeInfoElement = (Element) formTypeInfo.item( 0 );
- NodeList formTypeInfoNameList = formTypeInfoElement.getChildNodes();
- formType = formTypeInfoNameList.item( 0 ).getNodeValue().trim();
-
- mobileImportParameters.setFormType( formType );
-
- if( formType.equalsIgnoreCase( MobileImportParameters.FORM_TYPE_DATAFORM ) )
- {
- NodeList listOfDataValues = doc.getElementsByTagName( "dataValue" );
- int totalDataValues = listOfDataValues.getLength();
- for ( int s = 0; s < totalDataValues; s++ )
- {
- Node dataValueNode = listOfDataValues.item( s );
- if ( dataValueNode.getNodeType() == Node.ELEMENT_NODE )
- {
- Element dataValueElement = (Element) dataValueNode;
-
- NodeList dataElementIdList = dataValueElement.getElementsByTagName( "dataElement" );
- Element dataElementElement = (Element) dataElementIdList.item( 0 );
- NodeList textdataElementIdList = dataElementElement.getChildNodes();
- tempDeid = textdataElementIdList.item( 0 ).getNodeValue().trim();
-
- NodeList valueList = dataValueElement.getElementsByTagName( "value" );
- Element valueElement = (Element) valueList.item( 0 );
- NodeList textValueElementList = valueElement.getChildNodes();
- tempDataValue = textValueElementList.item( 0 ).getNodeValue();
-
- String tempDeID = tempDeid;
- //Integer tempDV = Integer.parseInt( tempDataValue );
-
- dataValues.put( tempDeID, tempDataValue );
- }
- }// end of for loop with s var
-
- mobileImportParameters.setDataValues( dataValues );
- }
- else if( formType.equalsIgnoreCase( MobileImportParameters.FORM_TYPE_ANMREGFORM ) )
- {
- // To get ANM Name
- NodeList anmNameInfo = doc.getElementsByTagName( "anmname" );
- Element anmNameInfoElement = (Element) anmNameInfo.item( 0 );
- NodeList anmNameInfoNameList = anmNameInfoElement.getChildNodes();
- anmName = anmNameInfoNameList.item( 0 ).getNodeValue().trim();
-
- mobileImportParameters.setAnmName( anmName );
- }
- else if( formType.equalsIgnoreCase( MobileImportParameters.FORM_TYPE_ANMQUERYFORM ) )
- {
- // To get ANM Query
- NodeList anmQueryInfo = doc.getElementsByTagName( "anmquery" );
- Element anmQueryInfoElement = (Element) anmQueryInfo.item( 0 );
- NodeList anmQueryInfoNameList = anmQueryInfoElement.getChildNodes();
- anmQuery = anmQueryInfoNameList.item( 0 ).getNodeValue().trim();
-
- mobileImportParameters.setAnmQuery( anmQuery );
- }
- }// try block end
- catch ( SAXParseException err )
- {
- System.out.println( "** Parsing error" + ", line " + err.getLineNumber() + ", uri " + err.getSystemId() );
- System.out.println( " " + err.getMessage() );
- }
- catch ( SAXException e )
- {
- Exception x = e.getException();
- ((x == null) ? e : x).printStackTrace();
- }
- catch ( Throwable t )
- {
- t.printStackTrace();
- }
-
- return mobileImportParameters;
-
- }// getParametersFromXML end
-
- @Override
- public List<String> getImportFiles()
- {
- List<String> fileNames = new ArrayList<String>();
-
- try
- {
- String importFolderPath = System.getProperty( "user.home" ) + File.separator + "dhis" + File.separator
- + "mi" + File.separator + "pending";
-
- String newpath = System.getenv( "DHIS2_HOME" );
- if ( newpath != null )
- {
- importFolderPath = newpath + File.separator + "mi" + File.separator + "pending";
- }
-
- File dir = new File( importFolderPath );
-
- String[] files = dir.list();
-
- fileNames = Arrays.asList( files );
- }
- catch ( Exception e )
- {
- System.out.println( e.getMessage() );
- }
-
- return fileNames;
- }
-
- public int moveFile( File source, File dest )
+ {
+ File importFile = locationManager.getFileForReading( fileName, "mi", "pending" );
+
+ String mobileNumber;
+ String smsTime;
+ String startDate;
+ String periodType;
+ String formType;
+ String anmName;
+ String anmQuery;
+
+ String tempDeid;
+ String tempDataValue;
+
+ Map<String, String> dataValues = new HashMap<String, String>();
+
+ MobileImportParameters mobileImportParameters = new MobileImportParameters();
+
+ try
+ {
+ DocumentBuilderFactory docBuilderFactory = DocumentBuilderFactory.newInstance();
+ DocumentBuilder docBuilder = docBuilderFactory.newDocumentBuilder();
+ Document doc = docBuilder.parse( importFile );
+ if ( doc == null )
+ {
+ return null;
+ }
+
+ // To get Mobile Number
+ NodeList sourceInfo = doc.getElementsByTagName( "source" );
+ Element sourceInfoElement = (Element) sourceInfo.item( 0 );
+ NodeList textsourceInfoNameList = sourceInfoElement.getChildNodes();
+ mobileNumber = textsourceInfoNameList.item( 0 ).getNodeValue().trim();
+
+ mobileImportParameters.setMobileNumber( mobileNumber );
+
+ // To get Period
+ NodeList periodInfo = doc.getElementsByTagName( "period" );
+ Element periodInfoElement = (Element) periodInfo.item( 0 );
+ NodeList textperiodInfoNameList = periodInfoElement.getChildNodes();
+ startDate = textperiodInfoNameList.item( 0 ).getNodeValue().trim();
+
+ mobileImportParameters.setStartDate( startDate );
+
+ // To get TimeStamp
+ NodeList timeStampInfo = doc.getElementsByTagName( "timeStamp" );
+ Element timeStampInfoElement = (Element) timeStampInfo.item( 0 );
+ NodeList texttimeStampInfoNameList = timeStampInfoElement.getChildNodes();
+ smsTime = texttimeStampInfoNameList.item( 0 ).getNodeValue().trim();
+
+ mobileImportParameters.setSmsTime( smsTime );
+
+ // To get PeriodType
+ NodeList periodTypeInfo = doc.getElementsByTagName( "periodType" );
+ Element periodTypeInfoElement = (Element) periodTypeInfo.item( 0 );
+ NodeList textPeriodTypeInfoNameList = periodTypeInfoElement.getChildNodes();
+ periodType = textPeriodTypeInfoNameList.item( 0 ).getNodeValue().trim();
+
+ mobileImportParameters.setPeriodType( periodType );
+
+ // To get FormType
+ NodeList formTypeInfo = doc.getElementsByTagName( "formtype" );
+ Element formTypeInfoElement = (Element) formTypeInfo.item( 0 );
+ NodeList formTypeInfoNameList = formTypeInfoElement.getChildNodes();
+ formType = formTypeInfoNameList.item( 0 ).getNodeValue().trim();
+
+ mobileImportParameters.setFormType( formType );
+
+ if ( formType.equalsIgnoreCase( MobileImportParameters.FORM_TYPE_DATAFORM ) )
+ {
+ NodeList listOfDataValues = doc.getElementsByTagName( "dataValue" );
+ int totalDataValues = listOfDataValues.getLength();
+ for ( int s = 0; s < totalDataValues; s++ )
+ {
+ Node dataValueNode = listOfDataValues.item( s );
+ if ( dataValueNode.getNodeType() == Node.ELEMENT_NODE )
+ {
+ Element dataValueElement = (Element) dataValueNode;
+
+ NodeList dataElementIdList = dataValueElement.getElementsByTagName( "dataElement" );
+ Element dataElementElement = (Element) dataElementIdList.item( 0 );
+ NodeList textdataElementIdList = dataElementElement.getChildNodes();
+ tempDeid = textdataElementIdList.item( 0 ).getNodeValue().trim();
+
+ NodeList valueList = dataValueElement.getElementsByTagName( "value" );
+ Element valueElement = (Element) valueList.item( 0 );
+ NodeList textValueElementList = valueElement.getChildNodes();
+ tempDataValue = textValueElementList.item( 0 ).getNodeValue();
+
+ String tempDeID = tempDeid;
+ // Integer tempDV = Integer.parseInt( tempDataValue );
+
+ dataValues.put( tempDeID, tempDataValue );
+ }
+ }// end of for loop with s var
+
+ mobileImportParameters.setDataValues( dataValues );
+ }
+ else if ( formType.equalsIgnoreCase( MobileImportParameters.FORM_TYPE_ANMREGFORM ) )
+ {
+ // To get ANM Name
+ NodeList anmNameInfo = doc.getElementsByTagName( "anmname" );
+ Element anmNameInfoElement = (Element) anmNameInfo.item( 0 );
+ NodeList anmNameInfoNameList = anmNameInfoElement.getChildNodes();
+ anmName = anmNameInfoNameList.item( 0 ).getNodeValue().trim();
+
+ mobileImportParameters.setAnmName( anmName );
+ }
+ else if ( formType.equalsIgnoreCase( MobileImportParameters.FORM_TYPE_ANMQUERYFORM ) )
+ {
+ // To get ANM Query
+ NodeList anmQueryInfo = doc.getElementsByTagName( "anmquery" );
+ Element anmQueryInfoElement = (Element) anmQueryInfo.item( 0 );
+ NodeList anmQueryInfoNameList = anmQueryInfoElement.getChildNodes();
+ anmQuery = anmQueryInfoNameList.item( 0 ).getNodeValue().trim();
+
+ mobileImportParameters.setAnmQuery( anmQuery );
+ }
+ }// try block end
+ catch ( SAXParseException err )
+ {
+ System.out.println( "** Parsing error" + ", line " + err.getLineNumber() + ", uri " + err.getSystemId() );
+ System.out.println( " " + err.getMessage() );
+ }
+ catch ( SAXException e )
+ {
+ Exception x = e.getException();
+ ((x == null) ? e : x).printStackTrace();
+ }
+ catch ( Throwable t )
+ {
+ t.printStackTrace();
+ }
+
+ return mobileImportParameters;
+
+ }// getParametersFromXML end
+
+ @Override
+ public List<String> getImportFiles()
+ {
+ List<String> fileNames = new ArrayList<String>();
+
+ try
+ {
+ String importFolderPath = System.getProperty( "user.home" ) + File.separator + "dhis" + File.separator
+ + "mi" + File.separator + "pending";
+
+ String newpath = System.getenv( "DHIS2_HOME" );
+ if ( newpath != null )
+ {
+ importFolderPath = newpath + File.separator + "mi" + File.separator + "pending";
+ }
+
+ File dir = new File( importFolderPath );
+
+ String[] files = dir.list();
+
+ fileNames = Arrays.asList( files );
+ }
+ catch ( Exception e )
+ {
+ System.out.println( e.getMessage() );
+ }
+
+ return fileNames;
+ }
+
+ public int moveFile( File source, File dest )
throws IOException
- {
-
- if ( !dest.exists() )
- {
- dest.createNewFile();
- }
-
- InputStream in = null;
-
- OutputStream out = null;
-
- try
- {
-
- in = new FileInputStream( source );
-
- out = new FileOutputStream( dest );
-
- byte[] buf = new byte[1024];
-
- int len;
-
- while ( (len = in.read( buf )) > 0 )
- {
- out.write( buf, 0, len );
- }
- }
- catch ( Exception e )
- {
- return -1;
- }
- finally
- {
- in.close();
-
- out.close();
- }
-
- return 1;
-
- }
-
- @Override
- public void moveImportedFile( String fileName )
- {
- try
- {
- String sourceFilePath = System.getProperty( "user.home" ) + File.separator + "dhis" + File.separator + "mi"
- + File.separator + "pending" + File.separator + fileName;
-
- String destFilePath = System.getProperty( "user.home" ) + File.separator + "dhis" + File.separator + "mi"
- + File.separator + "completed" + File.separator + fileName;
-
- String newpath = System.getenv( "DHIS2_HOME" );
- if ( newpath != null )
- {
- sourceFilePath = newpath + File.separator + "mi" + File.separator + "pending" + File.separator
- + fileName;
-
- destFilePath = newpath + File.separator + "mi" + File.separator + "completed" + File.separator
- + fileName;
- }
-
- File sourceFile = new File( sourceFilePath );
-
- File destFile = new File( destFilePath );
-
- int status = moveFile( sourceFile, destFile );
-
- if ( status == 1 )
- {
- sourceFile.delete();
- }
-
- }
- catch ( Exception e )
- {
- System.out.println( e.getMessage() );
- }
-
- }
-
- @Override
- public void moveFailedFile( String fileName )
- {
- try
- {
- String sourceFilePath = System.getProperty( "user.home" ) + File.separator + "dhis" + File.separator + "mi"
- + File.separator + "pending" + File.separator + fileName;
-
- String destFilePath = System.getProperty( "user.home" ) + File.separator + "dhis" + File.separator + "mi"
- + File.separator + "bounced" + File.separator + fileName;
-
- String newpath = System.getenv( "DHIS2_HOME" );
- if ( newpath != null )
- {
- sourceFilePath = newpath + File.separator + "mi" + File.separator + "pending" + File.separator
- + fileName;
-
- destFilePath = newpath + File.separator + "mi" + File.separator + "bounced" + File.separator + fileName;
- }
-
- File sourceFile = new File( sourceFilePath );
-
- File destFile = new File( destFilePath );
-
- int status = moveFile( sourceFile, destFile );
-
- if ( status == 1 )
- {
- sourceFile.delete();
- }
-
- }
- catch ( Exception e )
- {
- System.out.println( e.getMessage() );
- }
- }
-
- /*
- @Transactional
- public void importAllFiles()
- {
- BatchHandler<DataValue> batchHandler = batchHandlerFactory.createBatchHandler( DataValueBatchHandler.class );
- batchHandler.init();
-
- String importStatus;
- importStatus = "";
-
- List<String> fileNames = new ArrayList<String>( getImportFiles() );
-
- for ( String importFile : fileNames )
- {
- try
- {
- MobileImportParameters mobImportParameters = getParametersFromXML( importFile );
-
- if ( mobImportParameters == null )
- {
- LOG.error( importFile + " Import File is not Properly Formated First" );
- importStatus += "<br>" + new Date() + ": " + importFile + " Import File is not Properly Formated.";
- moveFailedFile( importFile );
- continue;
- }
-
- User curUser = getUserInfo( mobImportParameters.getMobileNumber() );
-
- if ( curUser != null )
- {
-
- UserCredentials userCredentials = userStore.getUserCredentials( curUser );
-
- if ( (userCredentials != null)
- && (mobImportParameters.getMobileNumber().equals( curUser.getPhoneNumber() )) )
- {
- storedBy = userCredentials.getUsername();
- }
- else
- {
- LOG.error( " Import File Contains Unrecognised Phone Numbers : "
- + mobImportParameters.getMobileNumber() );
- importStatus += "<br><font color=red><b>Import File Contains Unrecognised Phone Numbers :"
- + mobImportParameters.getMobileNumber() + ".</b></font>";
- moveFailedFile( importFile );
- continue;
- }
-
- List<Source> sources = new ArrayList<Source>( curUser.getOrganisationUnits() );
-
- if ( sources == null || sources.size() <= 0 )
- {
- importStatus += "<br><font color=red><b>No User Exist Who Registered Phone No. Is :"
- + mobImportParameters.getMobileNumber() + ".</b></font>";
- moveFailedFile( importFile );
- continue;
- }
- Source source = sources.get( 0 );
-
- System.out.println( "getStartDate = " + mobImportParameters.getStartDate() + " getPeriodType = "
- + mobImportParameters.getPeriodType() );
-
- Period period = getPeriodInfo( mobImportParameters.getStartDate(), mobImportParameters
- .getPeriodType() );
-
- SimpleDateFormat dateFormat = new SimpleDateFormat( "yyyy-MM-dd" );
- SimpleDateFormat monthFormat = new SimpleDateFormat("MMM-yy");
-
- Date timeStamp = dateFormat.parse( mobImportParameters.getSmsTime() );
-
- Map<String, String> dataValueMap = new HashMap<String, String>( mobImportParameters
- .getDataValues() );
-
- if ( dataValueMap == null || dataValueMap.size() <= 0 )
- {
- LOG.error( "dataValue map is null" );
- }
- else if ( source == null )
- {
- LOG.error( "source is null" );
- }
- else if ( period == null )
- {
- LOG.error( "period is null" );
- }
- else if ( timeStamp == null )
- {
- LOG.error( "timeStamp is null" );
- }
-
- if ( source == null || period == null || timeStamp == null || dataValueMap == null
- || dataValueMap.size() <= 0 )
- {
-
- LOG.error( importFile + " Import File is not Properly Formated" );
- importStatus += "<br>" + new Date() + ": " + importFile
- + " Import File is not Properly Formated.<br>";
- moveFailedFile( importFile );
- continue;
- }
-
- Set<String> keys = dataValueMap.keySet();
-
- for ( String key : keys )
- {
- String parts[] = key.split( "\\." );
-
- String deStr = parts[0];
-
- String optStr = parts[1];
-
- String value = String.valueOf( dataValueMap.get( key ) );
-
- DataElement dataElement = dataElementService.getDataElement( Integer.valueOf( deStr ) );
-
- DataElementCategoryOptionCombo optionCombo = new DataElementCategoryOptionCombo();
-
- optionCombo = dataElementCategoryService.getDataElementCategoryOptionCombo( Integer
- .valueOf( optStr ) );
-
- DataValue dataValue = new DataValue( dataElement, period, source, value, storedBy, timeStamp,
- null, optionCombo );
- boolean exists = batchHandler.objectExists( dataValue );
-
- if ( !exists )
- {
- if ( value != null )
- {
- batchHandler.addObject( dataValue );
- }
- }
- else
- {
- dataValue.setValue( value );
-
- dataValue.setTimestamp( timeStamp );
-
- dataValue.setStoredBy( storedBy );
-
- batchHandler.updateObject( dataValue );
- }
- }
-
- importStatus += "<br>" + new Date() + ": " + importFile + " is Imported Successfully.";
-
- moveImportedFile( importFile );
- }
- else
- {
- LOG.error( importFile + " Phone number not found... Sending to Bounced" );
- moveFailedFile( importFile );
- }
- }
- catch ( Exception e )
- {
- e.printStackTrace();
- LOG.error( e.getMessage() );
- LOG.error( "Exception caused in importing... Moving to Bounced" );
- moveFailedFile( importFile );
- }
- finally
- {
- batchHandler.flush();
- }
- }
- }
- */
- @Override
- @Transactional
- public void importPendingFiles()
- {
- List<String> fileNames = new ArrayList<String>( getImportFiles() );
-
- for ( String importFile : fileNames )
- {
- String statusMsg = importXMLFile( importFile );
-
- SendSMS sendSMS = new SendSMS( importFile.replace( ".xml", "" ), statusMsg );
-
- sendSMSService.addSendSMS( sendSMS );
- }
- }
-
- /*
- @Transactional
- public List<String> importPendingFile( String importFile )
- {
- List<String> statusMsgs = new ArrayList<String>();
-
+ {
+
+ if ( !dest.exists() )
+ {
+ dest.createNewFile();
+ }
+
+ InputStream in = null;
+
+ OutputStream out = null;
+
+ try
+ {
+ in = new FileInputStream( source );
+
+ out = new FileOutputStream( dest );
+
+ byte[] buf = new byte[1024];
+
+ int len;
+
+ while ( (len = in.read( buf )) > 0 )
+ {
+ out.write( buf, 0, len );
+ }
+ }
+ catch ( Exception e )
+ {
+ return -1;
+ }
+ finally
+ {
+ in.close();
+
+ out.close();
+ }
+
+ return 1;
+
+ }
+
+ @Override
+ public void moveImportedFile( String fileName )
+ {
+ try
+ {
+ String sourceFilePath = System.getProperty( "user.home" ) + File.separator + "dhis" + File.separator + "mi"
+ + File.separator + "pending" + File.separator + fileName;
+
+ String destFilePath = System.getProperty( "user.home" ) + File.separator + "dhis" + File.separator + "mi"
+ + File.separator + "completed" + File.separator + fileName;
+
+ String newpath = System.getenv( "DHIS2_HOME" );
+ if ( newpath != null )
+ {
+ sourceFilePath = newpath + File.separator + "mi" + File.separator + "pending" + File.separator
+ + fileName;
+
+ destFilePath = newpath + File.separator + "mi" + File.separator + "completed" + File.separator
+ + fileName;
+ }
+
+ File sourceFile = new File( sourceFilePath );
+
+ File destFile = new File( destFilePath );
+
+ int status = moveFile( sourceFile, destFile );
+
+ if ( status == 1 )
+ {
+ sourceFile.delete();
+ }
+ }
+ catch ( Exception e )
+ {
+ System.out.println( e.getMessage() );
+ }
+ }
+
+ @Override
+ public void moveFailedFile( String fileName )
+ {
+ try
+ {
+ String sourceFilePath = System.getProperty( "user.home" ) + File.separator + "dhis" + File.separator + "mi"
+ + File.separator + "pending" + File.separator + fileName;
+
+ String destFilePath = System.getProperty( "user.home" ) + File.separator + "dhis" + File.separator + "mi"
+ + File.separator + "bounced" + File.separator + fileName;
+
+ String newpath = System.getenv( "DHIS2_HOME" );
+ if ( newpath != null )
+ {
+ sourceFilePath = newpath + File.separator + "mi" + File.separator + "pending" + File.separator
+ + fileName;
+
+ destFilePath = newpath + File.separator + "mi" + File.separator + "bounced" + File.separator + fileName;
+ }
+
+ File sourceFile = new File( sourceFilePath );
+
+ File destFile = new File( destFilePath );
+
+ int status = moveFile( sourceFile, destFile );
+
+ if ( status == 1 )
+ {
+ sourceFile.delete();
+ }
+ }
+ catch ( Exception e )
+ {
+ System.out.println( e.getMessage() );
+ }
+ }
+
+ @Override
+ @Transactional
+ public void importPendingFiles()
+ {
+ try
+ {
+ List<String> fileNames = new ArrayList<String>( getImportFiles() );
+
+ for ( String importFile : fileNames )
+ {
+ String statusMsg = importXMLFile( importFile );
+ String senderInfo = importFile.replace( ".xml", "" );
+ SendSMS sendSMS = sendSMSService.getSendSMS( senderInfo );
+
+ if( sendSMS == null )
+ {
+ sendSMS = new SendSMS( senderInfo, statusMsg );
+ sendSMSService.addSendSMS( sendSMS );
+ }
+ else
+ {
+ sendSMS.setSendingMessage( statusMsg );
+ sendSMSService.updateSendSMS( sendSMS );
+ }
+ }
+ }
+ catch( Exception e )
+ {
+ System.out.println( e.getMessage() );
+ }
+ }
+
+ @Transactional
+ public String importANMRegData( String importFile, MobileImportParameters mobImportParameters )
+ {
+ String importStatus = "";
+
+ try
+ {
+ User curUser = getUserInfo( mobImportParameters.getMobileNumber() );
+
+ if ( curUser != null )
+ {
+ UserCredentials userCredentials = userStore.getUserCredentials( curUser );
+
+ if ( (userCredentials != null)
+ && (mobImportParameters.getMobileNumber().equals( curUser.getPhoneNumber() )) )
+ {
+ }
+ else
+ {
+ LOG.error( " Import File Contains Unrecognised Phone Numbers : "
+ + mobImportParameters.getMobileNumber() );
+ moveFailedFile( importFile );
+ return "Phone number is not registered to any facility. Please contact admin";
+ }
+
+ List<OrganisationUnit> sources = new ArrayList<OrganisationUnit>( curUser.getOrganisationUnits() );
+
+ if ( sources == null || sources.size() <= 0 )
+ {
+ LOG.error( " No User Exists with corresponding Phone Numbers : "
+ + mobImportParameters.getMobileNumber() );
+ moveFailedFile( importFile );
+
+ return "Phone number is not registered to any facility. Please contact admin";
+ }
+
+ OrganisationUnit source = sources.get( 0 );
+ String anmName = mobImportParameters.getAnmName();
+
+ if ( source == null || anmName == null || anmName.trim().equalsIgnoreCase( "" ) )
+ {
+ LOG.error( importFile + " Import File is not Properly Formated" );
+ moveFailedFile( importFile );
+
+ return "Data not Received Properly, Please send again";
+ }
+ source.setComment( anmName );
+ organisationUnitService.updateOrganisationUnit( source );
+
+ moveImportedFile( importFile );
+
+ importStatus = "YOUR NAME IS REGISTERD SUCCESSFULLY";
+ }
+ else
+ {
+ LOG.error( importFile + " Phone number not found... Sending to Bounced" );
+ importStatus = "Phone number is not registered to any facility. Please contact admin";
+ moveFailedFile( importFile );
+ }
+ }
+ catch ( Exception e )
+ {
+ e.printStackTrace();
+ LOG.error( e.getMessage() );
+ LOG.error( "Exception caused in importing... Moving to Bounced" );
+
+ importStatus = "Data not Received Properly, Please send again";
+ moveFailedFile( importFile );
+ }
+ finally
+ {
+ }
+
+ return importStatus;
+ }
+
+ @Transactional
+ public String importANMQueryData( String importFile, MobileImportParameters mobImportParameters )
+ {
+ String importStatus = "";
+
+ try
+ {
+ User curUser = getUserInfo( mobImportParameters.getMobileNumber() );
+
+ if ( curUser != null )
+ {
+ UserCredentials userCredentials = userStore.getUserCredentials( curUser );
+
+ if ( (userCredentials != null)
+ && (mobImportParameters.getMobileNumber().equals( curUser.getPhoneNumber() )) )
+ {
+ }
+ else
+ {
+ LOG.error( " Import File Contains Unrecognised Phone Numbers : "
+ + mobImportParameters.getMobileNumber() );
+ moveFailedFile( importFile );
+ return "Phone number is not registered to any facility. Please contact admin";
+ }
+
+ List<OrganisationUnit> sources = new ArrayList<OrganisationUnit>( curUser.getOrganisationUnits() );
+
+ if ( sources == null || sources.size() <= 0 )
+ {
+ LOG.error( " No User Exists with corresponding Phone Numbers : "
+ + mobImportParameters.getMobileNumber() );
+ moveFailedFile( importFile );
+
+ return "Phone number is not registered to any facility. Please contact admin";
+ }
+
+ String anmQuery = mobImportParameters.getAnmQuery();
+
+ if ( anmQuery == null || anmQuery.trim().equalsIgnoreCase( "" ) )
+ {
+ LOG.error( importFile + " Import File is not Properly Formated" );
+ moveFailedFile( importFile );
+
+ return "Data not Received Properly, Please send again";
+ }
+
+ ReceiveSMS receiveSMS = new ReceiveSMS( importFile, anmQuery );
+ receiveSMSService.addReceiveSMS( receiveSMS );
+
+ moveImportedFile( importFile );
+
+ importStatus = "YOUR Query IS REGISTERD SUCCESSFULLY";
+ }
+ else
+ {
+ LOG.error( importFile + " Phone number not found... Sending to Bounced" );
+ importStatus = "Phone number is not registered to any facility. Please contact admin";
+ moveFailedFile( importFile );
+ }
+ }
+ catch ( Exception e )
+ {
+ e.printStackTrace();
+ LOG.error( e.getMessage() );
+ LOG.error( "Exception caused in importing... Moving to Bounced" );
+
+ importStatus = "Data not Received Properly, Please send again";
+ moveFailedFile( importFile );
+ }
+ finally
+ {
+ }
+
+ return importStatus;
+ }
+
+ @Transactional
+ private OrganisationUnit getOrganisationUnitByPhone( String phoneNumber )
+ {
+ try
+ {
+ String query = "SELECT organisationunitid FROM organisationunit WHERE phoneNumber LIKE '" + phoneNumber
+ + "'";
+ SqlRowSet sqlResultSet = jdbcTemplate.queryForRowSet( query );
+ if ( sqlResultSet != null && sqlResultSet.next() )
+ {
+ Integer orgUnitId = sqlResultSet.getInt( 1 );
+ OrganisationUnit orgUnit = organisationUnitService.getOrganisationUnit( orgUnitId );
+ if ( orgUnit != null )
+ return orgUnit;
+ }
+
+ return null;
+ }
+ catch ( Exception e )
+ {
+ System.out.println( "Exception occurred while getting OrganisationUnit by phone number" );
+
+ return null;
+ }
+ }
+
+ @Transactional
+ private User getUserbyOrgUnit( int orgUnitId )
+ {
+ try
+ {
+ String query = "SELECT userinfoid FROM usermembership WHERE organisationunitid =" + orgUnitId;
+
+ SqlRowSet sqlResultSet = jdbcTemplate.queryForRowSet( query );
+ if ( sqlResultSet != null && sqlResultSet.next() )
+ {
+ Integer userId = sqlResultSet.getInt( 1 );
+ User user = userStore.getUser( userId );
+ if ( user != null )
+ return user;
+ }
+
+ return null;
+ }
+ catch( Exception e )
+ {
+ System.out.println( "Exception occurred while getting User by orgunit id" );
+ System.out.println( e.getMessage() );
+ return null;
+ }
+ }
+
+ @Override
+ @Transactional
+ public String importXMLFile( String importFile )
+ {
int insertFlag = 1;
String insertQuery = "INSERT INTO datavalue (dataelementid, periodid, sourceid, categoryoptioncomboid, value, storedby, lastupdated ) VALUES ";
- String importStatus="";
+ String importStatus = "";
try
{
@@ -767,776 +806,352 @@
if ( mobImportParameters == null )
{
- LOG.error( importFile + " Import File is not Properly Formated First" );
- moveFailedFile( importFile );
-
- statusMsgs.add( 0, "1" );
- statusMsgs.add( 1, "Data not Received Properly, Please send again" );
-
- return statusMsgs;
- }
-
- User curUser = getUserInfo( mobImportParameters.getMobileNumber() );
-
- if ( curUser != null )
- {
- UserCredentials userCredentials = userStore.getUserCredentials( curUser );
-
- if ( (userCredentials != null) && (mobImportParameters.getMobileNumber().equals( curUser.getPhoneNumber() )) )
- {
- storedBy = userCredentials.getUsername();
- }
- else
- {
- LOG.error( " Import File Contains Unrecognised Phone Numbers : "
- + mobImportParameters.getMobileNumber() );
- moveFailedFile( importFile );
-
- statusMsgs.add( 0, "2" );
- statusMsgs.add( 1, "Phone number is not registered to any facility. Please contact admin" );
-
- return statusMsgs;
- }
-
- List<Source> sources = new ArrayList<Source>( curUser.getOrganisationUnits() );
-
- if ( sources == null || sources.size() <= 0 )
- {
- LOG.error( " No User Exists with corresponding Phone Numbers : "
- + mobImportParameters.getMobileNumber() );
- moveFailedFile( importFile );
-
- statusMsgs.add( 0, "2" );
- statusMsgs.add( 1, "Phone number is not registered to any facility. Please contact admin" );
-
- return statusMsgs;
- }
-
- Source source = sources.get( 0 );
-
- Period period = getPeriodInfo( mobImportParameters.getStartDate(), mobImportParameters.getPeriodType() );
-
- SimpleDateFormat dateFormat = new SimpleDateFormat( "yyyy-MM-dd" );
- SimpleDateFormat monthFormat = new SimpleDateFormat("MMM-yy");
-
- Date timeStamp = dateFormat.parse( mobImportParameters.getSmsTime() );
-
- long t;
- if ( timeStamp == null )
- {
- Date d = new Date();
- t = d.getTime();
- }
- else
- {
- t = timeStamp.getTime();
- }
-
- java.sql.Date lastUpdatedDate = new java.sql.Date( t );
-
- Map<String, String> dataValueMap = new HashMap<String, String>( mobImportParameters.getDataValues() );
-
- if( dataValueMap == null || dataValueMap.size() <= 0 )
- {
- LOG.error( "dataValue map is null" );
- }
- else if( source == null )
- {
- LOG.error( "source is null" );
- }
- else if( period == null )
- {
- LOG.error( "period is null" );
- }
- else if( timeStamp == null )
- {
- LOG.error( "timeStamp is null" );
- }
-
- if( source == null || period == null || timeStamp == null || dataValueMap == null || dataValueMap.size() <= 0 )
- {
- LOG.error( importFile + " Import File is not Properly Formated" );
- moveFailedFile( importFile );
-
- statusMsgs.add( 0, "1" );
- statusMsgs.add( 1, "Data not Received Properly, Please send again" );
-
- return statusMsgs;
- }
-
- Set<String> keys = dataValueMap.keySet();
-
- for ( String key : keys )
- {
- String parts[] = key.split( "\\." );
-
- String deStr = parts[0];
-
- String optStr = parts[1];
-
- String value = String.valueOf( dataValueMap.get( key ) );
-
- DataElement dataElement = dataElementService.getDataElement( Integer.valueOf( deStr ) );
-
- DataElementCategoryOptionCombo optionCombo = new DataElementCategoryOptionCombo();
-
- optionCombo = dataElementCategoryService.getDataElementCategoryOptionCombo( Integer.valueOf( optStr ) );
-
- DataValue dataValue = dataValueService.getDataValue( source, dataElement, period, optionCombo );
-
- if ( dataValue == null )
- {
- if ( value != null )
- {
- insertQuery += "( "+ dataElement.getId() + ", " + period.getId() + ", "+ source.getId() +", " + optionCombo.getId() + ", '" + value + "', '" + storedBy + "', '" + lastUpdatedDate + "' ), ";
-
- insertFlag = 2;
- }
- }
- else
- {
- dataValue.setValue( value );
-
- dataValue.setTimestamp( timeStamp );
-
- dataValue.setStoredBy( storedBy );
-
- dataValueService.updateDataValue( dataValue );
- }
- }
-
- if( insertFlag != 1 )
- {
- insertQuery = insertQuery.substring( 0, insertQuery.length()-2 );
-
+ LOG.error( importFile + " Import File is not Properly Formatted" );
+
+ moveFailedFile( importFile );
+
+ return "Data not Received Properly, Please send again";
+ }
+
+ // Checking for FormType, if formtype is ANMREG
+ if ( mobImportParameters.getFormType().equalsIgnoreCase( MobileImportParameters.FORM_TYPE_ANMREGFORM ) )
+ {
+ importStatus = importANMRegData( importFile, mobImportParameters );
+ return importStatus;
+ }
+ else if ( mobImportParameters.getFormType().equalsIgnoreCase( MobileImportParameters.FORM_TYPE_ANMQUERYFORM ) )
+ {
+ importStatus = importANMQueryData( importFile, mobImportParameters );
+ return importStatus;
+ }
+
+ OrganisationUnit source = getOrganisationUnitByPhone( mobImportParameters.getMobileNumber() );
+
+ if ( source == null )
+ {
+ LOG.error( " No Faciliy Exists with corresponding Phone Number : "+ mobImportParameters.getMobileNumber() );
+ moveFailedFile( importFile );
+ return "Phone number is not registered to any facility. Please contact admin";
+ }
+
+ User curUser = getUserbyOrgUnit( source.getId() );
+
+ if ( curUser == null )
+ {
+ LOG.error( " No User Exists with corresponding Facility : " + mobImportParameters.getMobileNumber() );
+ storedBy = "[unknown]-" + mobImportParameters.getMobileNumber();
+ }
+ else
+ {
+ UserCredentials userCredentials = userStore.getUserCredentials( curUser );
+ storedBy = userCredentials.getUsername();
+ }
+
+ Period period = getPeriodInfo( mobImportParameters.getStartDate(), mobImportParameters.getPeriodType() );
+
+ SimpleDateFormat dateFormat = new SimpleDateFormat( "yyyy-MM-dd" );
+ SimpleDateFormat monthFormat = new SimpleDateFormat( "MMM-yy" );
+
+ Date timeStamp = dateFormat.parse( mobImportParameters.getSmsTime() );
+
+ long t;
+ if ( timeStamp == null )
+ {
+ Date d = new Date();
+ t = d.getTime();
+ }
+ else
+ {
+ t = timeStamp.getTime();
+ }
+
+ java.sql.Date lastUpdatedDate = new java.sql.Date( t );
+
+ Map<String, String> dataValueMap = new HashMap<String, String>( mobImportParameters.getDataValues() );
+
+ if ( dataValueMap == null || dataValueMap.size() <= 0 )
+ {
+ LOG.error( "dataValue map is null" );
+ }
+ else if ( source == null )
+ {
+ LOG.error( "source is null" );
+ }
+ else if ( period == null )
+ {
+ LOG.error( "period is null" );
+ }
+ else if ( timeStamp == null )
+ {
+ LOG.error( "timeStamp is null" );
+ }
+
+ if ( source == null || period == null || timeStamp == null || dataValueMap == null || dataValueMap.size() <= 0 )
+ {
+ LOG.error( importFile + " Import File is not Properly Formated" );
+ moveFailedFile( importFile );
+ return "Data not Received Properly, Please send again";
+ }
+
+ Set<String> keys = dataValueMap.keySet();
+
+ for ( String key : keys )
+ {
+ String parts[] = key.split( "\\." );
+
+ String deStr = parts[0];
+
+ String optStr = parts[1];
+
+ String value = String.valueOf( dataValueMap.get( key ) );
+
+ DataElement dataElement = dataElementService.getDataElement( Integer.valueOf( deStr ) );
+
+ DataElementCategoryOptionCombo optionCombo = new DataElementCategoryOptionCombo();
+
+ optionCombo = dataElementCategoryService.getDataElementCategoryOptionCombo( Integer.valueOf( optStr ) );
+
+ DataValue dataValue = dataValueService.getDataValue( source, dataElement, period, optionCombo );
+
+ if ( value.trim().equalsIgnoreCase( "" ) )
+ {
+ value = null;
+ }
+
+ if ( dataValue == null )
+ {
+ if ( value != null )
+ {
+ insertQuery += "( " + dataElement.getId() + ", " + period.getId() + ", " + source.getId()
+ + ", " + optionCombo.getId() + ", '" + value + "', '" + storedBy + "', '" + lastUpdatedDate
+ + "' ), ";
+ insertFlag = 2;
+ }
+ }
+ else
+ {
+ /*
+ dataValue.setValue( value );
+ dataValue.setTimestamp( timeStamp );
+ dataValue.setStoredBy( storedBy );
+ dataValueService.updateDataValue( dataValue );
+ */
+ String updateQuery = "UPDATE datavalue SET value = '"+ value +"', storedby = '"+ storedBy +"', lastupdated = '"+ lastUpdatedDate +"' " +
+ "WHERE dataelementid = "+ dataElement.getId() +
+ " AND periodid = "+ period.getId() +
+ " AND sourceid = "+ source.getId() +
+ " AND categoryoptioncomboid = "+optionCombo.getId();
+
+ jdbcTemplate.update( updateQuery );
+ }
+ }
+
+ if ( insertFlag != 1 )
+ {
+ insertQuery = insertQuery.substring( 0, insertQuery.length() - 2 );
+
+ jdbcTemplate.update( insertQuery );
+ }
+
+ moveImportedFile( importFile );
+
+ if ( period.getPeriodType().getName().equalsIgnoreCase( "monthly" ) )
+ {
+ importStatus = "THANK YOU FOR SENDING MONTHLY REPORT FOR " + monthFormat.format( period.getStartDate() );
+ }
+ else if ( period.getPeriodType().getName().equalsIgnoreCase( "daily" ) )
+ {
+ importStatus = "THANK YOU FOR SENDING DAILY REPORT FOR " + dateFormat.format( period.getStartDate() );
+ }
+ else
+ {
+ importStatus = "THANK YOU FOR SENDING REPORT FOR " + dateFormat.format( period.getStartDate() ) + " : "
+ + dateFormat.format( period.getEndDate() );
+ }
+ }
+ catch ( Exception e )
+ {
+ e.printStackTrace();
+ LOG.error( e.getMessage() );
+ LOG.error( "Exception caused in importing... Moving to Bounced" );
+
+ importStatus = "Data not Received Properly, Please send again";
+ moveFailedFile( importFile );
+ }
+ finally
+ {
+ }
+
+ return importStatus;
+ }
+
+ public void importInteractionMessage( String smsText, String sender, Date sendTime )
+ {
+
+ String insertQuery = "INSERT INTO datavalue (dataelementid, periodid, sourceid, categoryoptioncomboid, value, storedby, lastupdated ) VALUES ";
+
+ try
+ {
+ String[] smstext = smsText.split( "#" );
+
+ System.out.println( "original text: " + smsText );
+
+ String dataelementid = smstext[1];
+ String periodid = smstext[2];
+ String comboid = smstext[3];
+ String value = smstext[4];
+
+ OrganisationUnit source = getOrganisationUnitByPhone( sender );
+
+ System.out.println( "-----------------source--------------" + source );
+
+ User curUser = getUserbyOrgUnit( source.getId() );
+
+ // User curUser = userStore.getUser(1);
+
+ // User curUser = null;
+
+ if ( curUser == null )
+ {
+ LOG.error( " No User Exists with corresponding Facility : " + sender );
+
+ storedBy = "[unknown]-" + sender;
+ }
+ else
+ {
+ UserCredentials userCredentials = userStore.getUserCredentials( curUser );
+
+ storedBy = userCredentials.getUsername();
+ }
+ DataElement dataElement = dataElementService.getDataElement( dataelementid );
+
+ DataElementCategoryOptionCombo optionCombo = new DataElementCategoryOptionCombo();
+
+ optionCombo = dataElementCategoryService.getDataElementCategoryOptionCombo( comboid );
+
+ Period period = periodService.getPeriod( Integer.parseInt( periodid ) );
+
+ DataValue dataValue = dataValueService.getDataValue( source, dataElement, period, optionCombo );
+
+ /*
+ * if( value.trim().equalsIgnoreCase("") ) { value = null; }
+ */
+
+ SimpleDateFormat dateFormat = new SimpleDateFormat( "yyyy-MM-dd" );
+ SimpleDateFormat monthFormat = new SimpleDateFormat( "MMM-yy" );
+
+ int date = sendTime.getDate();
+ int month = sendTime.getMonth() + 1;
+ int year = sendTime.getYear() + 1900;
+ int hour = sendTime.getHours();
+ int minutes = sendTime.getMinutes();
+ int seconds = sendTime.getSeconds();
+
+ String sendtime = "";
+
+ sendtime += "" + year;
+
+ sendtime += "-";
+
+ if ( month < 10 )
+ {
+ sendtime += "0" + month;
+ }
+ else
+ {
+ sendtime += "" + month;
+ }
+
+ sendtime += "-";
+
+ if ( date < 10 )
+ {
+ sendtime += "0" + date;
+ }
+ else
+ {
+ sendtime += "" + date;
+ }
+
+ sendtime += "_";
+
+ if ( hour < 10 )
+ {
+ sendtime += "0" + hour;
+ }
+ else
+ {
+ sendtime += "" + hour;
+ }
+
+ sendtime += "-";
+
+ if ( minutes < 10 )
+ {
+ sendtime += "0" + minutes;
+ }
+ else
+ {
+ sendtime += "" + minutes;
+ }
+
+ sendtime += "-";
+
+ if ( seconds < 10 )
+ {
+ sendtime += "0" + seconds;
+ }
+ else
+ {
+ sendtime += "" + seconds;
+ }
+
+ System.out.println( "Time: " + sendtime );
+ Date timeStamp = dateFormat.parse( sendtime );
+
+ long t;
+ if ( timeStamp == null )
+ {
+ Date d = new Date();
+ t = d.getTime();
+ }
+ else
+ {
+ t = timeStamp.getTime();
+ }
+
+ java.sql.Date lastUpdatedDate = new java.sql.Date( t );
+
+ System.out.println( "( " + Integer.parseInt( dataelementid ) + ", " + period.getId() + ", "
+ + source.getId() + ", " + Integer.parseInt( comboid ) + ", '" + value + "', '" + storedBy + "', '"
+ + lastUpdatedDate + "' ) " );
+ if ( dataValue == null )
+ {
+ if ( value != null )
+ {
+ insertQuery += "( " + Integer.parseInt( dataelementid ) + ", " + period.getId() + ", "
+ + source.getId() + ", " + Integer.parseInt( comboid ) + ", '" + value + "', '" + storedBy
+ + "', '" + lastUpdatedDate + "' ) ";
jdbcTemplate.update( insertQuery );
}
-
- moveImportedFile( importFile );
-
- if( period.getPeriodType().getName().equalsIgnoreCase( "monthly" ))
- {
- importStatus = "THANK YOU FOR SENDING MONTHLY REPORT FOR " + monthFormat.format( period.getStartDate() );
-
- statusMsgs.add( 0, "3" );
- statusMsgs.add( 1, importStatus );
- }
- else if( period.getPeriodType().getName().equalsIgnoreCase( "daily" ))
- {
- importStatus = "THANK YOU FOR SENDING DAILY REPORT FOR " + dateFormat.format( period.getStartDate() );
-
- statusMsgs.add( 0, "4" );
- statusMsgs.add( 1, importStatus );
- }
- else
- {
- importStatus = "THANK YOU FOR SENDING REPORT FOR " + dateFormat.format( period.getStartDate() ) + " : " + dateFormat.format( period.getEndDate() );
-
- statusMsgs.add( 0, "5" );
- statusMsgs.add( 1, importStatus );
- }
}
else
{
- LOG.error( importFile + " Phone number not found... Sending to Bounced" );
- importStatus = "Phone number is not registered to any facility. Please contact admin";
-
- statusMsgs.add( 0, "2" );
- statusMsgs.add( 1, importStatus );
-
- moveFailedFile( importFile );
+ dataValue.setValue( value );
+
+ dataValue.setTimestamp( timeStamp );
+
+ dataValue.setStoredBy( storedBy );
+
+ dataValueService.updateDataValue( dataValue );
}
}
- catch( Exception e )
+ catch ( Exception e )
{
e.printStackTrace();
LOG.error( e.getMessage() );
- LOG.error( "Exception caused in importing... Moving to Bounced" );
-
- importStatus = "Data not Received Properly, Please send again";
-
- statusMsgs.add( 0, "1" );
- statusMsgs.add( 1, importStatus );
-
- moveFailedFile( importFile );
- }
- finally
- {
- }
-
- return statusMsgs;
+ LOG.error( "Interactive message not processed" );
+ }
+
}
- */
-
- @Transactional
- public String importANMRegData( String importFile, MobileImportParameters mobImportParameters )
- {
- String importStatus="";
-
- try
- {
- User curUser = getUserInfo( mobImportParameters.getMobileNumber() );
-
- if ( curUser != null )
- {
- UserCredentials userCredentials = userStore.getUserCredentials( curUser );
-
- if ( (userCredentials != null)
- && (mobImportParameters.getMobileNumber().equals( curUser.getPhoneNumber() )) )
- {
- }
- else
- {
- LOG.error( " Import File Contains Unrecognised Phone Numbers : "
- + mobImportParameters.getMobileNumber() );
- moveFailedFile( importFile );
- return "Phone number is not registered to any facility. Please contact admin";
- }
-
- List<OrganisationUnit> sources = new ArrayList<OrganisationUnit>( curUser.getOrganisationUnits() );
-
- if ( sources == null || sources.size() <= 0 )
- {
- LOG.error( " No User Exists with corresponding Phone Numbers : "
- + mobImportParameters.getMobileNumber() );
- moveFailedFile( importFile );
-
- return "Phone number is not registered to any facility. Please contact admin";
- }
-
- OrganisationUnit source = sources.get( 0 );
- String anmName = mobImportParameters.getAnmName();
-
- if ( source == null || anmName == null || anmName.trim().equalsIgnoreCase( "" ) )
- {
- LOG.error( importFile + " Import File is not Properly Formated" );
- moveFailedFile( importFile );
-
- return "Data not Received Properly, Please send again";
- }
- source.setComment( anmName );
- organisationUnitService.updateOrganisationUnit( source );
-
- moveImportedFile( importFile );
-
- importStatus = "YOUR NAME IS REGISTERD SUCCESSFULLY";
- }
- else
- {
- LOG.error( importFile + " Phone number not found... Sending to Bounced" );
- importStatus = "Phone number is not registered to any facility. Please contact admin";
- moveFailedFile( importFile );
- }
- }
- catch ( Exception e )
- {
- e.printStackTrace();
- LOG.error( e.getMessage() );
- LOG.error( "Exception caused in importing... Moving to Bounced" );
-
- importStatus = "Data not Received Properly, Please send again";
- moveFailedFile( importFile );
- }
- finally
- {
- }
-
- return importStatus;
- }
-
- @Transactional
- public String importANMQueryData( String importFile, MobileImportParameters mobImportParameters )
- {
- String importStatus="";
-
- try
- {
- User curUser = getUserInfo( mobImportParameters.getMobileNumber() );
-
- if ( curUser != null )
- {
- UserCredentials userCredentials = userStore.getUserCredentials( curUser );
-
- if ( (userCredentials != null)
- && (mobImportParameters.getMobileNumber().equals( curUser.getPhoneNumber() )) )
- {
- }
- else
- {
- LOG.error( " Import File Contains Unrecognised Phone Numbers : "
- + mobImportParameters.getMobileNumber() );
- moveFailedFile( importFile );
- return "Phone number is not registered to any facility. Please contact admin";
- }
-
- List<OrganisationUnit> sources = new ArrayList<OrganisationUnit>( curUser.getOrganisationUnits() );
-
- if ( sources == null || sources.size() <= 0 )
- {
- LOG.error( " No User Exists with corresponding Phone Numbers : "
- + mobImportParameters.getMobileNumber() );
- moveFailedFile( importFile );
-
- return "Phone number is not registered to any facility. Please contact admin";
- }
-
- String anmQuery = mobImportParameters.getAnmQuery();
-
- if ( anmQuery == null || anmQuery.trim().equalsIgnoreCase( "" ) )
- {
- LOG.error( importFile + " Import File is not Properly Formated" );
- moveFailedFile( importFile );
-
- return "Data not Received Properly, Please send again";
- }
-
- ReceiveSMS receiveSMS = new ReceiveSMS( importFile, anmQuery );
- receiveSMSService.addReceiveSMS( receiveSMS );
-
- moveImportedFile( importFile );
-
- importStatus = "YOUR Query IS REGISTERD SUCCESSFULLY";
- }
- else
- {
- LOG.error( importFile + " Phone number not found... Sending to Bounced" );
- importStatus = "Phone number is not registered to any facility. Please contact admin";
- moveFailedFile( importFile );
- }
- }
- catch ( Exception e )
- {
- e.printStackTrace();
- LOG.error( e.getMessage() );
- LOG.error( "Exception caused in importing... Moving to Bounced" );
-
- importStatus = "Data not Received Properly, Please send again";
- moveFailedFile( importFile );
- }
- finally
- {
- }
-
- return importStatus;
- }
-
- private OrganisationUnit getOrganisationUnitByPhone( String phoneNumber )
- {
- String query="SELECT * FROM organisationunit WHERE phoneNumber LIKE '"+ phoneNumber +"'";
-
- /*
- SqlRowSet sqlResultSet = jdbcTemplate.queryForRowSet( query );
- if ( sqlResultSet != null && sqlResultSet.next() )
- {
- Integer orgUnitId = sqlResultSet.getInt( 1 );
- OrganisationUnit orgUnit = organisationUnitService.getOrganisationUnit( orgUnitId );
- if( orgUnit != null )
- return orgUnit;
- }
-
- return null;
- */
-
- OrganisationUnit result = null;
-
- result = ( OrganisationUnit) jdbcTemplate.queryForObject( query, new RowMapper<OrganisationUnit>()
- {
- @Override
- public OrganisationUnit mapRow( ResultSet rs, int i ) throws SQLException
- {
- OrganisationUnit orgUnit=new OrganisationUnit();
- orgUnit.setId( rs.getInt( "organisationunitid") );
- orgUnit.setUuid( rs.getString( "uuid") );
- orgUnit.setName( rs.getString( "name") );
- orgUnit.setPhoneNumber( rs.getString( "phoneNumber") );
-
- return orgUnit;
- // throw new UnsupportedOperationException( "Not supported yet." );
- }
-
- } );
-
- return result;
- }
-
- private User getUserbyOrgUnit( int orgUnitId )
- {
- //int userid;
- String query = "SELECT userinfoid FROM usermembership WHERE organisationunitid =" + orgUnitId;
- //userid = jdbcTemplate.queryForInt( query );
- //return userid;
-
- SqlRowSet sqlResultSet = jdbcTemplate.queryForRowSet( query );
- if ( sqlResultSet != null && sqlResultSet.next() )
- {
- Integer userId = sqlResultSet.getInt( 1 );
- User user = userStore.getUser( userId );
- if( user != null )
- return user;
- }
-
- return null;
- }
-
- @Override
- @Transactional
- public String importXMLFile( String importFile )
- {
- int insertFlag = 1;
- String insertQuery = "INSERT INTO datavalue (dataelementid, periodid, sourceid, categoryoptioncomboid, value, storedby, lastupdated ) VALUES ";
- String importStatus="";
-
- try
- {
- MobileImportParameters mobImportParameters = getParametersFromXML( importFile );
-
- if ( mobImportParameters == null )
- {
- LOG.error( importFile + " Import File is not Properly Formatted" );
-
- moveFailedFile( importFile );
-
- return "Data not Received Properly, Please send again";
- }
-
- // Checking for FormType, if formtype is ANMREG
- if( mobImportParameters.getFormType().equalsIgnoreCase( MobileImportParameters.FORM_TYPE_ANMREGFORM ) )
- {
- importStatus = importANMRegData( importFile, mobImportParameters );
-
- return importStatus;
- }
- else if( mobImportParameters.getFormType().equalsIgnoreCase( MobileImportParameters.FORM_TYPE_ANMQUERYFORM ) )
- {
- importStatus = importANMQueryData( importFile, mobImportParameters );
-
- return importStatus;
- }
-
- OrganisationUnit source = getOrganisationUnitByPhone( mobImportParameters.getMobileNumber() );
-
- if ( source == null )
- {
- LOG.error( " No Faciliy Exists with corresponding Phone Number : " + mobImportParameters.getMobileNumber() );
-
- moveFailedFile( importFile );
-
- return "Phone number is not registered to any facility. Please contact admin";
- }
-
- User curUser = getUserbyOrgUnit( source.getId() );
-
- if ( curUser == null )
- {
- LOG.error( " No User Exists with corresponding Facility : " + mobImportParameters.getMobileNumber() );
-
- storedBy = "[unknown]-"+mobImportParameters.getMobileNumber();
- }
- else
- {
- UserCredentials userCredentials = userStore.getUserCredentials( curUser );
-
- storedBy = userCredentials.getUsername();
- }
-
- Period period = getPeriodInfo( mobImportParameters.getStartDate(), mobImportParameters.getPeriodType() );
-
- SimpleDateFormat dateFormat = new SimpleDateFormat( "yyyy-MM-dd" );
- SimpleDateFormat monthFormat = new SimpleDateFormat("MMM-yy");
-
- Date timeStamp = dateFormat.parse( mobImportParameters.getSmsTime() );
-
- long t;
- if ( timeStamp == null )
- {
- Date d = new Date();
- t = d.getTime();
- }
- else
- {
- t = timeStamp.getTime();
- }
-
- java.sql.Date lastUpdatedDate = new java.sql.Date( t );
-
- Map<String, String> dataValueMap = new HashMap<String, String>( mobImportParameters.getDataValues() );
-
- if ( dataValueMap == null || dataValueMap.size() <= 0 )
- {
- LOG.error( "dataValue map is null" );
- }
- else if ( source == null )
- {
- LOG.error( "source is null" );
- }
- else if ( period == null )
- {
- LOG.error( "period is null" );
- }
- else if ( timeStamp == null )
- {
- LOG.error( "timeStamp is null" );
- }
-
- if ( source == null || period == null || timeStamp == null || dataValueMap == null || dataValueMap.size() <= 0 )
- {
- LOG.error( importFile + " Import File is not Properly Formated" );
-
- moveFailedFile( importFile );
-
- return "Data not Received Properly, Please send again";
- }
-
- Set<String> keys = dataValueMap.keySet();
-
- for ( String key : keys )
- {
- String parts[] = key.split( "\\." );
-
- String deStr = parts[0];
-
- String optStr = parts[1];
-
- String value = String.valueOf( dataValueMap.get( key ) );
-
- DataElement dataElement = dataElementService.getDataElement( Integer.valueOf( deStr ) );
-
- DataElementCategoryOptionCombo optionCombo = new DataElementCategoryOptionCombo();
-
- optionCombo = dataElementCategoryService.getDataElementCategoryOptionCombo( Integer.valueOf( optStr ) );
-
- DataValue dataValue = dataValueService.getDataValue( source, dataElement, period, optionCombo );
-
- if( value.trim().equalsIgnoreCase("") )
- {
- value = null;
- }
-
- if ( dataValue == null )
- {
- if ( value != null )
- {
- insertQuery += "( "+ dataElement.getId() + ", " + period.getId() + ", "+ source.getId() +", " + optionCombo.getId() + ", '" + value + "', '" + storedBy + "', '" + lastUpdatedDate + "' ), ";
-
- insertFlag = 2;
- }
- }
- else
- {
- dataValue.setValue( value );
-
- dataValue.setTimestamp( timeStamp );
-
- dataValue.setStoredBy( storedBy );
-
- dataValueService.updateDataValue( dataValue );
- }
- }
-
- if( insertFlag != 1 )
- {
- insertQuery = insertQuery.substring( 0, insertQuery.length()-2 );
-
- jdbcTemplate.update( insertQuery );
- }
-
- moveImportedFile( importFile );
-
- if( period.getPeriodType().getName().equalsIgnoreCase( "monthly" ))
- {
- importStatus = "THANK YOU FOR SENDING MONTHLY REPORT FOR " + monthFormat.format( period.getStartDate() );
- }
- else if( period.getPeriodType().getName().equalsIgnoreCase( "daily" ))
- {
- importStatus = "THANK YOU FOR SENDING DAILY REPORT FOR " + dateFormat.format( period.getStartDate() );
- }
- else
- {
- importStatus = "THANK YOU FOR SENDING REPORT FOR " + dateFormat.format( period.getStartDate() ) + " : " + dateFormat.format( period.getEndDate() );
- }
- }
- catch ( Exception e )
- {
- e.printStackTrace();
- LOG.error( e.getMessage() );
- LOG.error( "Exception caused in importing... Moving to Bounced" );
-
- importStatus = "Data not Received Properly, Please send again";
- moveFailedFile( importFile );
- }
- finally
- {
- }
-
- return importStatus;
- }
-
- public void importInteractionMessage( String smsText, String sender, Date sendTime )
- {
-
- String insertQuery = "INSERT INTO datavalue (dataelementid, periodid, sourceid, categoryoptioncomboid, value, storedby, lastupdated ) VALUES ";
-
- try
- {
- String [] smstext = smsText.split( "#" );
-
- System.out.println( "original text: " + smsText );
-
- String dataelementid = smstext[1];
- String periodid = smstext[2];
- String comboid = smstext[3];
- String value = smstext[4];
-
-
- OrganisationUnit source = getOrganisationUnitByPhone( sender );
-
- System.out.println( "-----------------source--------------" + source );
-
- User curUser = getUserbyOrgUnit( source.getId() );
-
- //User curUser = userStore.getUser(1);
-
- //User curUser = null;
-
- if ( curUser == null )
- {
- LOG.error( " No User Exists with corresponding Facility : " + sender );
-
- storedBy = "[unknown]-"+sender;
- }
- else
- {
- UserCredentials userCredentials = userStore.getUserCredentials( curUser );
-
- storedBy = userCredentials.getUsername();
- }
- DataElement dataElement = dataElementService.getDataElement( dataelementid );
-
- DataElementCategoryOptionCombo optionCombo = new DataElementCategoryOptionCombo();
-
- optionCombo = dataElementCategoryService.getDataElementCategoryOptionCombo( comboid );
-
- Period period = periodService.getPeriod( Integer.parseInt( periodid ));
-
- DataValue dataValue = dataValueService.getDataValue( source, dataElement, period, optionCombo );
-
- /*if( value.trim().equalsIgnoreCase("") )
- {
- value = null;
- }*/
-
- SimpleDateFormat dateFormat = new SimpleDateFormat( "yyyy-MM-dd" );
- SimpleDateFormat monthFormat = new SimpleDateFormat("MMM-yy");
-
- int date = sendTime.getDate();
- int month = sendTime.getMonth()+1;
- int year = sendTime.getYear()+1900;
- int hour = sendTime.getHours();
- int minutes = sendTime.getMinutes();
- int seconds = sendTime.getSeconds();
-
- String sendtime = "";
-
- sendtime += "" + year;
-
- sendtime += "-";
-
- if( month < 10 )
- {
- sendtime += "0" + month;
- }
- else
- {
- sendtime += "" + month;
- }
-
- sendtime += "-";
-
- if( date < 10 )
- {
- sendtime += "0" + date;
- }
- else
- {
- sendtime += "" + date;
- }
-
- sendtime += "_";
-
- if( hour < 10 )
- {
- sendtime += "0" + hour;
- }
- else
- {
- sendtime += "" + hour;
- }
-
- sendtime += "-";
-
- if( minutes < 10 )
- {
- sendtime += "0" + minutes;
- }
- else
- {
- sendtime += "" + minutes;
- }
-
- sendtime += "-";
-
- if( seconds < 10 )
- {
- sendtime += "0" + seconds;
- }
- else
- {
- sendtime += "" + seconds;
- }
-
- System.out.println( "Time: " + sendtime );
- Date timeStamp = dateFormat.parse( sendtime );
-
- long t;
- if ( timeStamp == null )
- {
- Date d = new Date();
- t = d.getTime();
- }
- else
- {
- t = timeStamp.getTime();
- }
-
- java.sql.Date lastUpdatedDate = new java.sql.Date( t );
-
- System.out.println("( "+ Integer.parseInt(dataelementid) + ", " + period.getId() + ", "+ source.getId() +", " + Integer.parseInt(comboid) + ", '" + value + "', '" + storedBy + "', '" + lastUpdatedDate + "' ) ");
- if ( dataValue == null )
- {
- if ( value != null )
- {
- insertQuery += "( "+ Integer.parseInt(dataelementid) + ", " + period.getId() + ", "+ source.getId() +", " + Integer.parseInt(comboid) + ", '" + value + "', '" + storedBy + "', '" + lastUpdatedDate + "' ) ";
- jdbcTemplate.update( insertQuery );
- }
- }
- else
- {
- dataValue.setValue( value );
-
- dataValue.setTimestamp( timeStamp );
-
- dataValue.setStoredBy( storedBy );
-
- dataValueService.updateDataValue( dataValue );
- }
- }
- catch ( Exception e )
- {
- e.printStackTrace();
- LOG.error( e.getMessage() );
- LOG.error( "Interactive message not processed" );
- }
-
- }
}
-
=== modified file 'local/in/dhis-mobile/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/api/MobileImportService.java'
--- local/in/dhis-mobile/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/api/MobileImportService.java 2011-07-07 11:56:37 +0000
+++ local/in/dhis-mobile/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/api/MobileImportService.java 2011-09-03 11:14:13 +0000
@@ -56,5 +56,5 @@
public void readAllMessages();
- public void importInteractionMessage( String smsText, String sender, Date sendTime );
+ public void importInteractionMessage( String smsText, String sender, Date sendTime );
}
=== modified file 'local/in/dhis-mobile/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/api/SendSMSService.java'
--- local/in/dhis-mobile/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/api/SendSMSService.java 2011-04-15 11:41:30 +0000
+++ local/in/dhis-mobile/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/api/SendSMSService.java 2011-09-03 11:14:13 +0000
@@ -20,6 +20,8 @@
Collection<SendSMS> getAllSendSMS( );
+ SendSMS getSendSMS( String senderInfo );
+
long getRowCount();
}
=== modified file 'local/in/dhis-mobile/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/api/SendSMSStore.java'
--- local/in/dhis-mobile/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/api/SendSMSStore.java 2011-04-15 11:41:30 +0000
+++ local/in/dhis-mobile/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/api/SendSMSStore.java 2011-09-03 11:14:13 +0000
@@ -20,5 +20,7 @@
Collection<SendSMS> getAllSendSMS( );
+ SendSMS getSendSMS( String senderInfo );
+
long getRowCount();
}
=== modified file 'local/in/dhis-mobile/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/impl/DefaultSendSMSService.java'
--- local/in/dhis-mobile/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/impl/DefaultSendSMSService.java 2011-04-15 11:41:30 +0000
+++ local/in/dhis-mobile/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/impl/DefaultSendSMSService.java 2011-09-03 11:14:13 +0000
@@ -54,4 +54,9 @@
{
return sendSMSStore.getRowCount();
}
+
+ public SendSMS getSendSMS( String senderInfo )
+ {
+ return sendSMSStore.getSendSMS( senderInfo );
+ }
}
=== modified file 'local/in/dhis-mobile/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/impl/HibernateSendSMSStore.java'
--- local/in/dhis-mobile/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/impl/HibernateSendSMSStore.java 2011-04-15 11:41:30 +0000
+++ local/in/dhis-mobile/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/impl/HibernateSendSMSStore.java 2011-09-03 11:14:13 +0000
@@ -6,6 +6,7 @@
import org.hibernate.Session;
import org.hibernate.SessionFactory;
import org.hibernate.criterion.Projections;
+import org.hibernate.criterion.Restrictions;
import org.hisp.dhis.mobile.api.SendSMS;
import org.hisp.dhis.mobile.api.SendSMSStore;
@@ -64,7 +65,6 @@
return session.createQuery( "from SendSMS" ).list();
}
- @SuppressWarnings( "unchecked" )
public long getRowCount()
{
Session session = sessionFactory.getCurrentSession();
@@ -74,5 +74,15 @@
Long count = (Long) criteria.uniqueResult();
return count != null ? count.longValue() : (long) 0;
}
+
+ public SendSMS getSendSMS( String senderInfo )
+ {
+ Session session = sessionFactory.getCurrentSession();
+
+ Criteria criteria = session.createCriteria( SendSMS.class );
+ criteria.add( Restrictions.eq( "senderInfo", senderInfo ) );
+
+ return (SendSMS) criteria.uniqueResult();
+ }
}
=== modified file 'local/in/dhis-mobile/dhis-service-mobile/src/main/resources/META-INF/dhis/beans.xml'
--- local/in/dhis-mobile/dhis-service-mobile/src/main/resources/META-INF/dhis/beans.xml 2011-04-15 11:41:30 +0000
+++ local/in/dhis-mobile/dhis-service-mobile/src/main/resources/META-INF/dhis/beans.xml 2011-09-03 11:14:13 +0000
@@ -140,7 +140,7 @@
-->
<property name="triggers">
<list>
- <ref bean="cronTriggerForCheckDataStatusJob" />
+ <!--<ref bean="cronTriggerForCheckDataStatusJob" />-->
<ref bean="simpleTriggerForSendSMS" />
</list>
</property>
=== modified file 'local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/deTargetAnalysisResult.vm'
--- local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/deTargetAnalysisResult.vm 2011-01-17 06:56:53 +0000
+++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/deTargetAnalysisResult.vm 2011-09-03 11:14:13 +0000
@@ -1,7 +1,7 @@
<script>
- var selectedOrgUnitId = $selectedOrgId;
- var selctedIndicatorId = $selectedIndicatorId;
+ //var selectedOrgUnitId = $selectedOrgId;
+ //var selctedIndicatorId = $selectedIndicatorId;
function exportToExcelFunction1( )
{
