Feature/amp 30885/adapt the burkina faso importer to be able to process txt

amp/WEB-INF/src/org/dgfoundation/amp/onepager/components/AmpFundingAmountComponent.java

@@ -50,7 +50,7 @@
 /**
  * Reusable component capturing an amount item in AMP (the tuple amount /
  * currency / date )
- * 
+ *
  * @author [email protected] since Nov 2, 2010
  */
 public class AmpFundingAmountComponent<T> extends Panel {
@@ -70,17 +70,17 @@ public List<KeyValue> getObject() {
             int startYear = FeaturesUtil.getGlobalSettingValueInteger(GlobalSettingsConstants.YEAR_RANGE_START);
             int range = FeaturesUtil.getGlobalSettingValueInteger(GlobalSettingsConstants.NUMBER_OF_YEARS_IN_RANGE);
             boolean fiscal = MTEFYearsModel.getFiscal();
-            
+
             list = new ArrayList<KeyValue>(range);
-            
+
             Calendar calendar = Calendar.getInstance();
             calendar.set(Calendar.DAY_OF_YEAR, 1);
-            
+
             for (int i = 0; i < range; i++) {
                 calendar.set(Calendar.YEAR, startYear + i);
                 list.add(MTEFYearsModel.convert(calendar.getTime(), fiscal));
             }
-            
+
             return list;
         }
     };
@@ -93,15 +93,15 @@ public AmpFundingAmountComponent(String id, IModel<T> model, String fmAmount,
         this(id, model, fmAmount, propertyAmount, fmCurrency, propertyCurrency, fmDate, propertyDate,
                 isMTEFProjection, false,null);
     }
-    
+
     public AmpFundingAmountComponent(String id, IModel<T> model, String fmAmount,
             String propertyAmount, String fmCurrency, String propertyCurrency,
             String fmDate, String propertyDate, boolean isMTEFProjection,String amountSize) {
         this(id, model, fmAmount, propertyAmount, fmCurrency, propertyCurrency, fmDate, propertyDate,
                 isMTEFProjection, false,amountSize);
     }
 
-    
+
     protected AmpFundingAmountComponent(String id, IModel<T> model, String fmAmount,
             String propertyAmount, String fmCurrency, String propertyCurrency,
             String fmDate, String propertyDate, boolean isMTEFProjection, boolean fundingComponentTableMode,String amountSize) {
@@ -112,16 +112,16 @@ protected AmpFundingAmountComponent(String id, IModel<T> model, String fmAmount,
         this.isMTEFProjection=isMTEFProjection;
         amount = new AmpTextFieldPanel<Double>("amount",
                 new PropertyModel<Double>(model, propertyAmount), fmAmount, hideLabel, hideNewLine) {
-            
+
             @Override
             protected void onAjaxOnUpdate(final AjaxRequestTarget target) {
                 AmpComponentPanel parentPanel = findParent(AmpFundingItemFeaturePanel.class);
                 if(parentPanel ==null)
-                    parentPanel = findParent(AmpComponentField.class);              
+                    parentPanel = findParent(AmpComponentField.class);
                 if(parentPanel ==null)
                     parentPanel = findParent(AmpRegionalFundingItemFeaturePanel.class);
                 if(parentPanel==null)
-                    parentPanel = findParent(AmpComponentFormTableAnnualBudget.class);              
+                    parentPanel = findParent(AmpComponentFormTableAnnualBudget.class);
                 parentPanel.visitChildren(AmpCollectionValidatorField.class, new IVisitor<AmpCollectionValidatorField, Void>() {
                     @Override
                     public void component(AmpCollectionValidatorField component,
@@ -130,20 +130,20 @@ public void component(AmpCollectionValidatorField component,
                         visit.dontGoDeeper();
                     }
                 });
-                
+
 
                 onFundingDetailChanged(target);
             }
-            
+
             public IConverter getInternalConverter(java.lang.Class<?> type) {
                 return CustomDoubleConverter.INSTANCE;
             }
         };
         amount.getTextContainer().setRequired(true);
         if(amountSize==null)
-            amount.getTextContainer().add(new AttributeModifier("size", new Model<String>("9")));
+            amount.getTextContainer().add(new AttributeModifier("size", new Model<>("9")));
         else
-            amount.getTextContainer().add(new AttributeModifier("size", new Model<String>(amountSize)));
+            amount.getTextContainer().add(new AttributeModifier("size", new Model<>(amountSize)));
 
         add(amount);
 
@@ -225,14 +225,14 @@ public void component(AmpSimpleValidatorField component, IVisit<Void> visit) {
         } else if (!FeaturesUtil.getGlobalSettingValueBoolean(GlobalSettingsConstants.MTEF_ANNUAL_DATE_FORMAT)) {
             AmpDatePickerFieldPanel datetmp = new AmpDatePickerFieldPanel(
                     "date", new PropertyModel<Date>(model, propertyDate), fmDate, null, hideLabel, hideNewLine);
-            
+
             datetmp.getDate().setRequired(true);
             datetmp.getDate().add(new AttributeModifier("class", "inputx_date"));
             date = datetmp;
         } else {
             MTEFYearsModel yearModel = new MTEFYearsModel(new PropertyModel<Date>(model, propertyDate));
 
-            AmpSelectFieldPanel<KeyValue> datetmp = new AmpSelectFieldPanel<KeyValue>("date", yearModel, 
+            AmpSelectFieldPanel<KeyValue> datetmp = new AmpSelectFieldPanel<KeyValue>("date", yearModel,
                         mtefYearsChoices, fmDate, true, true, new ChoiceRenderer<KeyValue>("value", "key"));
             date = datetmp;
         }
@@ -243,10 +243,10 @@ public void component(AmpSimpleValidatorField component, IVisit<Void> visit) {
 
         setRenderBodyOnly(true);
     }
-    
+
     /**
      * Method called when the amount field value has been changed
-     * 
+     *
      * @param target
      */
     protected void onFundingDetailChanged(AjaxRequestTarget target) {
@@ -282,7 +282,7 @@ public Component getDate() {
         return date;
     }
     private void sendEvent(AjaxRequestTarget target){
-        
+
     }
     public void setAmountValidator(final AmpCollectionValidatorField validationHiddenField){
         validationFields.add(validationHiddenField);
@@ -292,7 +292,7 @@ public void setAmountValidator(final AmpCollectionValidatorField validationHidde
             protected void onUpdate(final AjaxRequestTarget target) {
                 AmpComponentPanel parentPanel = findParent(AmpFundingItemFeaturePanel.class);
                 if(parentPanel ==null)
-                    parentPanel = findParent(AmpComponentField.class);              
+                    parentPanel = findParent(AmpComponentField.class);
                 if(parentPanel ==null)
                     parentPanel = findParent(AmpRegionalFundingItemFeaturePanel.class);
                 parentPanel.visitChildren(AmpCollectionValidatorField.class, new IVisitor<AmpCollectionValidatorField, Void>() {

amp/WEB-INF/src/org/dgfoundation/amp/onepager/util/ActivityUtil.java

@@ -99,8 +99,6 @@
 import org.hibernate.LockOptions;
 import org.hibernate.Query;
 import org.hibernate.Session;
-import org.hibernate.criterion.Projections;
-import org.hibernate.criterion.Restrictions;
 
 /**
  * Util class used to manipulate an activity
@@ -202,12 +200,12 @@ public static void prepareToSave(AmpActivityVersion a, AmpActivityVersion oldA,
             setActivityStatus(ampCurrentMember, draft, a, oldA, newActivity, context.isRejected());
         }
     }
-    
+
     public static AmpActivityVersion saveActivityNewVersion(AmpActivityVersion a,
             Collection<AmpContentTranslation> translations, List<AmpContentTranslation> cumulativeTranslations,
             AmpTeamMember ampCurrentMember, boolean draft,
             Session session, SaveContext context, EditorStore editorStore, Site site) throws Exception {
-        
+
         boolean draftChange = detectDraftChange(a, draft);
         return saveActivityNewVersion(a, translations, cumulativeTranslations, ampCurrentMember, draft,
                 draftChange, session, context, editorStore, site);
@@ -313,7 +311,7 @@ public static AmpActivityVersion saveActivityNewVersion(AmpActivityVersion a,
         saveAgreements(a, session, isActivityForm);
         saveContacts(a, session, (draft != draftChange), ampCurrentMember);
 
-        updateComponentFunding(a, session);
+        updateComponentFunding(a);
         saveAnnualProjectBudgets(a, session);
         saveProjectCosts(a, session);
         saveStructures(a, session);
@@ -354,7 +352,7 @@ private static void updateIndirectPrograms(AmpActivityVersion a, Session session
     public static boolean detectDraftChange(AmpActivityVersion a, boolean draft) {
         return Boolean.TRUE.equals(a.getDraft()) != draft;
     }
-    
+
     public static <T extends AmpActivityFields> boolean isNewActivity(T a) {
         // it would be nicer to rely upon AMP ID, but some old activities may lack it
         return a.getAmpActivityId() == null;
@@ -628,7 +626,7 @@ public static boolean canApprove(AmpTeamMember atm, Long activityTeamId, Approva
         }
         return false;
     }
-    
+
     /**
      *  An activity can be rejected only if:
      *  1. the activity is not new
@@ -645,7 +643,7 @@ public static boolean canReject(AmpTeamMember atm, Boolean isDraft, Boolean isNe
         return BooleanUtils.isFalse(isNewActivity) && BooleanUtils.isFalse(isDraft)
                 && isProjectValidationOn(getValidationSetting(atm)) && isApprover(atm);
     }
-    
+
     /**
      * Detect if the teammember is approver of the workspace or is the teamlead of the ws
      *
@@ -742,29 +740,18 @@ public static AmpActivityVersion load(AmpActivityModel am, Long id) {
     }
 
 
-    private static void updateComponentFunding(AmpActivityVersion a, Session session) {
+    private static void updateComponentFunding(AmpActivityVersion a) {
         Set<AmpComponent> components = a.getComponents();
 
         if (components == null) {
             return;
         }
 
-        Iterator<AmpComponent> componentIterator = components.iterator();
-        while (componentIterator.hasNext()) {
-            AmpComponent ampComponent = componentIterator.next();
+        for (AmpComponent ampComponent : components) {
+            if (Hibernate.isInitialized(ampComponent.getFundings()) && (ampComponent.getFundings() != null)) {
 
-            if (Hibernate.isInitialized(ampComponent.getFundings())) {
-                if (ampComponent.getFundings() != null) {
-                    Iterator<AmpComponentFunding> ampComponentFundingsIterator = ampComponent.getFundings().iterator();
+                    ampComponent.getFundings().removeIf(acf -> acf.getTransactionAmount() == null);
 
-                    while (ampComponentFundingsIterator.hasNext()) {
-                        AmpComponentFunding acf = ampComponentFundingsIterator.next();
-
-                        if (acf.getTransactionAmount() == null) {
-                            ampComponentFundingsIterator.remove();
-                        }
-                    }
-                }
             }
         }
     }
@@ -777,18 +764,14 @@ private static void saveComments(AmpActivityVersion a, Session session, boolean
         HashSet<AmpComments> delComm = s.getMetaData(OnePagerConst.COMMENTS_DELETED_ITEMS);
 
         if (delComm != null){
-            Iterator<AmpComments> di = delComm.iterator();
-            while (di.hasNext()) {
-                AmpComments tComm = (AmpComments) di.next();
+            for (AmpComments tComm : delComm) {
                 session.delete(tComm);
             }
         }
 
         if (newComm != null){
-            Iterator<AmpComments> ni = newComm.iterator();
-            while (ni.hasNext()) {
-                AmpComments tComm = (AmpComments) ni.next();
-                if (ActivityVersionUtil.isVersioningEnabled() && !draft){
+            for (AmpComments tComm : newComm) {
+                if (ActivityVersionUtil.isVersioningEnabled() && !draft) {
                     try {
                         tComm = (AmpComments) tComm.prepareMerge(a);
                     } catch (CloneNotSupportedException e) {
@@ -797,7 +780,7 @@ private static void saveComments(AmpActivityVersion a, Session session, boolean
                 }
 
                 if (tComm.getMemberId() == null)
-                    tComm.setMemberId(((AmpAuthWebSession)org.apache.wicket.Session.get()).getAmpCurrentMember());
+                    tComm.setMemberId(((AmpAuthWebSession) org.apache.wicket.Session.get()).getAmpCurrentMember());
                 if (tComm.getAmpActivityId() == null)
                     tComm.setAmpActivityId(a);
                 session.saveOrUpdate(tComm);

amp/WEB-INF/src/org/dgfoundation/amp/onepager/util/SessionUtil.java

@@ -46,8 +46,8 @@ public static void extendSessionIfNeeded(HttpServletRequest request) {
 
             // Extend session timeout if remaining time is 30 seconds or less
             if (remainingTime <= 30000) { // 30 seconds in milliseconds
-                // Extend session timeout to 130 minutes
-                session.setMaxInactiveInterval(1800); // 130 minutes * 60 seconds
+                // Extend session timeout to 30 minutes
+                session.setMaxInactiveInterval(1800); // 30 minutes * 60 seconds
                 logger.info("Session timeout extended to "+session.getMaxInactiveInterval());
             }
         }

amp/WEB-INF/src/org/digijava/module/admin/util/DbUtil.java

@@ -22,12 +22,6 @@
 
 package org.digijava.module.admin.util;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.StringTokenizer;
-
 import org.apache.log4j.Logger;
 import org.dgfoundation.amp.error.AMPException;
 import org.digijava.kernel.ampapi.endpoints.config.utils.ConfigHelper;
@@ -46,6 +40,8 @@
 import org.hibernate.Session;
 import org.hibernate.Transaction;
 
+import java.util.*;
+
 public class DbUtil {
 
     private static Logger logger = Logger.getLogger(DbUtil.class);
@@ -200,7 +196,7 @@ public static Group getGroupByKey(String key) throws
             logger.debug("Unable to get group from database ", ex);
             throw new AdminException("Unable to get group from database ", ex);
         }
-        return group;   
+        return group;
     }
     public static void editGroup(Group group) throws AdminException {
         Session sess = null;