AMP-30723 -implement amp TruBudget integration

Add field for reject reason
devgateway · brianbrix · Sep 18, 2023 · Sep 18, 2023 · Sep 18, 2023 · Sep 18, 2023
commit 1ff0eb48b7f344a5573c511425aec075b8d2c89b
diff --git a/...ndation/amp/onepager/components/features/tables/AmpComponentsFundingFormTableFeature.html b/...ndation/amp/onepager/components/features/tables/AmpComponentsFundingFormTableFeature.html
@@ -6,6  6,7 @@
             <div>
                 <span class="wicketFloatLeft wicketFundingBoxItem" wicket:id="adjustmentType"/>
                 <span class="wicketFloatLeft wicketFundingBoxItem" wicket:id="componentFundingStatus"/>
                 <span class="wicketFloatLeft wicketFundingBoxItem" wicket:id="componentRejectReason"/>
                 <span class="wicketFloatLeft wicketFundingBoxItem" wicket:id="orgSelect"/>
                 <span class="wicketFloatLeft wicketFundingBoxItem" wicket:id="secondOrgSelect"/>
                 <span class="wicketFloatLeft wicketFundingBoxItem" wicket:id="fundingAmount"/>

diff --git a/...ndation/amp/onepager/components/features/tables/AmpComponentsFundingFormTableFeature.java b/...ndation/amp/onepager/components/features/tables/AmpComponentsFundingFormTableFeature.java
@@ -5,17  5,18 @@
 package org.dgfoundation.amp.onepager.components.features.tables;
 
 import org.apache.wicket.AttributeModifier;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
 import org.apache.wicket.event.Broadcast;
 import org.apache.wicket.model.AbstractReadOnlyModel;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.PropertyModel;
 import org.dgfoundation.amp.onepager.OnePagerConst;
 import org.dgfoundation.amp.onepager.components.AmpFundingAmountComponent;
 import org.dgfoundation.amp.onepager.components.ListEditor;
 import org.dgfoundation.amp.onepager.components.ListEditorRemoveButton;
-import org.dgfoundation.amp.onepager.components.fields.AmpCategorySelectFieldPanel;
-import org.dgfoundation.amp.onepager.components.fields.AmpComponentFundingNewResourceFieldPanel;
-import org.dgfoundation.amp.onepager.components.fields.AmpSelectFieldPanel;
-import org.dgfoundation.amp.onepager.components.fields.AmpTextFieldPanel;
 import org.dgfoundation.amp.onepager.components.fields.*;
 import org.dgfoundation.amp.onepager.events.ContactChangedEvent;
 import org.dgfoundation.amp.onepager.events.FundingOrgListUpdateEvent;
 import org.dgfoundation.amp.onepager.events.UpdateEventBehavior;
 import org.dgfoundation.amp.onepager.models.AbstractMixedSetModel;
@@ -24,6  25,7 @@
 import org.digijava.module.aim.dbentity.AmpComponent;
 import org.digijava.module.aim.dbentity.AmpComponentFunding;
 import org.digijava.module.aim.dbentity.AmpOrganisation;
 import org.digijava.module.categorymanager.dbentity.AmpCategoryValue;
 import org.digijava.module.categorymanager.util.CategoryConstants;
 
 import java.util.*;
@@ -78,19  80,36 @@ protected void onPopulateItem(org.dgfoundation.amp.onepager.components.ListItem<
                     adjustmentTypes.getChoiceContainer().add(new AttributeModifier("style", "width: 100px;"));
                     item.add(adjustmentTypes);
 
-
-
-
                 } catch(Exception e) {
                     logger.info("Unable to add adjustment type dropdown: ",e);
                 }
                 try {
                      AmpTextAreaFieldPanel rejectReason = new AmpTextAreaFieldPanel("componentRejectReason",  new PropertyModel<>(model, "componentRejectReason"), "Reject Reason", false, false, false);
                     rejectReason.setOutputMarkupId(true);
                     rejectReason.setVisible(false);
                     rejectReason.add(new AttributeModifier("style", "display: none;"));
                     item.add(rejectReason);
 
                     AmpCategorySelectFieldPanel componentFundingStatus = new AmpCategorySelectFieldPanel(
                             "componentFundingStatus", CategoryConstants.COMPONENT_FUNDING_STATUS_KEY,
                             new PropertyModel<>(model, "componentFundingStatus"),
                             COMPONENT_FUNDING_STATUS, //fmname
-                            false, false, false, null, false);
                             false, false, false, null, false)
                             ;
                     componentFundingStatus.getChoiceContainer().add(new AjaxFormComponentUpdatingBehavior("onchange") {
                         @Override
                         protected void onUpdate(AjaxRequestTarget target) {
                             String selectedValue = model.getObject().getComponentFundingStatus().getValue();
                             logger.info("Selected Status: " selectedValue);
                             if ("rejected".equalsIgnoreCase(selectedValue)) {
                                 target.appendJavaScript("$('#"   rejectReason.getMarkupId()   "').show();");
                             } else {
                                 target.appendJavaScript("$('#"   rejectReason.getMarkupId()   "').hide();");
                             }
 
 
                         }
                     });
                     componentFundingStatus.getChoiceContainer().setRequired(true);
                     componentFundingStatus.getChoiceContainer().add(new AttributeModifier("style", "width: 100px;"));
                     item.add(componentFundingStatus);

diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/onepager/components/fields/AmpTextAreaFieldPanel.java b/amp/WEB-INF/src/org/dgfoundation/amp/onepager/components/fields/AmpTextAreaFieldPanel.java
@@ -61,7  61,7 @@ public AmpTextAreaFieldPanel(String id,IModel<String> model, String fmName,boole
             model = (IModel<String>) new EditorWrapperModel((IModel<String>) model, id);
         }
         final IModel<String> finalModel = model;
-        textAreaContainer = new TextArea<String>("richText", TranslationDecorator.proxyModel((IModel<String>) model)){
         textAreaContainer = new TextArea<String>("richText", TranslationDecorator.proxyModel(model)){
             @Override
             protected void onInitialize() {
                 //get validators and put them in the {@link TranslatableValidators}

diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/onepager/util/ActivityUtil.java b/amp/WEB-INF/src/org/dgfoundation/amp/onepager/util/ActivityUtil.java
@@ -88,6  88,7 @@ public static void saveActivity(AmpActivityModel am, boolean draft, boolean reje
             logger.error("WRONG LANGUAGE: TLSUtils("   TLSUtils.getLangCode()   ") vs Wicket("   wicketSession.getLocale().getLanguage()   ")");
         }
 
 
         AmpTeamMember ampCurrentMember = wicketSession.getAmpCurrentMember();
 
         ServletContext sc = wicketSession.getHttpSession().getServletContext();

diff --git a/amp/WEB-INF/src/org/digijava/module/aim/action/EditActivity.java b/amp/WEB-INF/src/org/digijava/module/aim/action/EditActivity.java
@@ -1858,6  1858,7 @@ private void getComponents(AmpActivityVersion activity, EditActivityForm eaForm,
 
                 fd.setCurrencyName(ampCompFund.getCurrency().getCurrencyName());
                 fd.setComponentFundingStatus(ampCompFund.getComponentFundingStatus());
                 fd.setComponentRejectReason(ampCompFund.getComponentRejectReason());
                 fd.setTransactionDate(DateConversion.convertDateToLocalizedString(ampCompFund.getTransactionDate()));
                 fd.setFiscalYear(DateConversion.convertDateToFiscalYearString(ampCompFund.getTransactionDate()));
                 fd.setTransactionType(ampCompFund.getTransactionType());

diff --git a/amp/WEB-INF/src/org/digijava/module/aim/dbentity/AmpComponentFunding.hbm.xml b/amp/WEB-INF/src/org/digijava/module/aim/dbentity/AmpComponentFunding.hbm.xml
@@ -14,6  14,7 @@
 		<!--  property name="adjustmentType" column="adjustment_type" type="java.lang.Integer" /-->
 		<property name="transactionDate" column="transaction_date" type="java.util.Date" />
 		<property name="reportingDate" column="reporting_date" type="java.util.Date" />
 		<property name="componentRejectReason" column="reject_reason" type="java.lang.String" />
 		<property name="justAnId" column="just_an_id" type="java.lang.String" />
 		<property access="field" name="transactionAmount" column="transaction_amount"
 			type="java.lang.Double" />

diff --git a/amp/WEB-INF/src/org/digijava/module/aim/dbentity/AmpComponentFunding.java b/amp/WEB-INF/src/org/digijava/module/aim/dbentity/AmpComponentFunding.java
@@ -62,6  62,12 @@ public void setJustAnId(String justAnId) {
     private AmpCategoryValue componentFundingStatus;
 
 
     @Interchangeable(fieldTitle = "Reject Reason", importable = true, pickIdOnly = true,
             fmPath = FMVisibility.PARENT_FM   "/"   "Reject Reason",
             interValidators = @InterchangeableValidator(RequiredValidator.class))
     private String componentRejectReason="";
 
 
     @Interchangeable(fieldTitle = "Component Funding Documents",  fmPath = FMVisibility.PARENT_FM   "/"   COMPONENT_FUNDING_DOCS, importable = true)
     @VersionableCollection(fieldTitle = "Component Funding Documents")
     private Set<AmpComponentFundingDocument> componentFundingDocuments = new HashSet<>();
@@ -100,6  106,15 @@ public Set<AmpComponentFundingDocument> getComponentFundingDocuments() {
     @InterchangeableBackReference
     private AmpComponent component;
 
     public String getComponentRejectReason() {
         return componentRejectReason;
     }
 
     public void setComponentRejectReason(String componentRejectReason) {
         this.componentRejectReason = componentRejectReason;
     }
 
 
     /**
      * @return Returns the adjustmentType.
      */

diff --git a/amp/WEB-INF/src/org/digijava/module/aim/helper/FundingDetail.java b/amp/WEB-INF/src/org/digijava/module/aim/helper/FundingDetail.java
@@ -36,6  36,16 @@ public void setComponentFundingStatus(AmpCategoryValue componentFundingStatus) {
 
     private AmpCategoryValue componentFundingStatus;
 
     public String getComponentRejectReason() {
         return componentRejectReason;
     }
 
     public void setComponentRejectReason(String componentRejectReason) {
         this.componentRejectReason = componentRejectReason;
     }
 
     private String componentRejectReason="";
 
     private AmpCategoryValue projectionTypeName;
     private AmpCategoryValue expenditureClass;
     private String transactionDate;

diff --git a/amp/WEB-INF/src/org/digijava/module/aim/util/ActivityUtil.java b/amp/WEB-INF/src/org/digijava/module/aim/util/ActivityUtil.java
@@ -603,6  603,7 @@ public static Collection<Components> getAllComponents(Long id) {
                   FundingDetail fd = new FundingDetail();
                   fd.setAdjustmentTypeName(cf.getAdjustmentType());
                   fd.setComponentFundingStatus(cf.getComponentFundingStatus());
                   fd.setComponentRejectReason(cf.getComponentRejectReason());
 
                   fd.setCurrencyCode(cf.getCurrency().getCurrencyCode());
                   fd.setCurrencyName(cf.getCurrency().getCurrencyName());