CE-1068 - bringing together variable-criteria with running scheduled reports :allthethings:

qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/savedreports/ReportValuesDynamicFormWidgetRenderer.java

@@ -22,6 +22,7 @@
 package com.kingsrook.qqq.backend.core.model.savedreports;
 
 
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -31,10 +32,12 @@ import com.kingsrook.qqq.backend.core.actions.tables.GetAction;
 import com.kingsrook.qqq.backend.core.actions.values.QPossibleValueTranslator;
 import com.kingsrook.qqq.backend.core.context.QContext;
 import com.kingsrook.qqq.backend.core.exceptions.QException;
+import com.kingsrook.qqq.backend.core.instances.QInstanceEnricher;
 import com.kingsrook.qqq.backend.core.logging.QLogger;
 import com.kingsrook.qqq.backend.core.model.actions.tables.get.GetInput;
 import com.kingsrook.qqq.backend.core.model.actions.tables.query.QFilterCriteria;
 import com.kingsrook.qqq.backend.core.model.actions.tables.query.QQueryFilter;
+import com.kingsrook.qqq.backend.core.model.actions.tables.query.expressions.FilterVariableExpression;
 import com.kingsrook.qqq.backend.core.model.actions.widgets.RenderWidgetInput;
 import com.kingsrook.qqq.backend.core.model.actions.widgets.RenderWidgetOutput;
 import com.kingsrook.qqq.backend.core.model.dashboard.widgets.DynamicFormWidgetData;
@@ -61,6 +64,7 @@ public class ReportValuesDynamicFormWidgetRenderer extends AbstractWidgetRendere
    private QPossibleValueTranslator qPossibleValueTranslator;
 
 
+
    /*******************************************************************************
     **
     *******************************************************************************/
@@ -118,56 +122,56 @@ public class ReportValuesDynamicFormWidgetRenderer extends AbstractWidgetRendere
             ///////////////////////////////////////////////////////////////////////////////////////////////
             for(QFilterCriteria criteria : CollectionUtils.nonNullList(queryFilter.getCriteria()))
             {
-               /////////////////////////////////
+               for(Serializable criteriaValue : CollectionUtils.nonNullList(criteria.getValues()))
-               // todo - only variable fields //
-               /////////////////////////////////
-
-               ////////////////////////////////
-               // todo - twice for "between" //
-               ////////////////////////////////
-
-               //////////////////////////
-               // todo - join fields!! //
-               //////////////////////////
-               QFieldMetaData fieldMetaData = table.getField(criteria.getFieldName()).clone();
-
-               /////////////////////////////////
-               // make name & label for field //
-               /////////////////////////////////
-               String operatorHumanish = StringUtils.allCapsToMixedCase(criteria.getOperator().name()); // todo match frontend..?
-               String fieldName        = criteria.getFieldName() + operatorHumanish.replaceAll("_", "");
-               String label            = fieldMetaData.getLabel() + " " + operatorHumanish.replaceAll("_", " ");
-               fieldMetaData.setName(fieldName);
-               fieldMetaData.setLabel(label);
-
-               ////////////////////////////////////////////////////////////
-               // in this use case, every field is required and editable //
-               ////////////////////////////////////////////////////////////
-               fieldMetaData.setIsRequired(true);
-               fieldMetaData.setIsEditable(true);
-
-               if(defaultValues.containsKey(fieldName))
                {
-                  String value = defaultValues.get(fieldName);
+                  if(criteriaValue instanceof FilterVariableExpression filterVariableExpression)
-
-                  fieldMetaData.setDefaultValue(value);
-                  recordOfFieldValues.setValue(fieldName, value);
-
-                  //////////////////////////////////////////////////////
-                  // look up display values for possible value fields //
-                  //////////////////////////////////////////////////////
-                  if(StringUtils.hasContent(fieldMetaData.getPossibleValueSourceName()))
                   {
-                     if(qPossibleValueTranslator == null)
+                     //////////////////////////
+                     // todo - join fields!! //
+                     //////////////////////////
+                     QFieldMetaData fieldMetaData = table.getField(criteria.getFieldName()).clone();
+
+                     /////////////////////////////////
+                     // make name & label for field //
+                     /////////////////////////////////
+                     String fieldName = filterVariableExpression.getVariableName();
+                     fieldMetaData.setName(fieldName);
+                     fieldMetaData.setLabel(QInstanceEnricher.nameToLabel(filterVariableExpression.getVariableName()));
+
+                     ////////////////////////////////////////////////////////////
+                     // in this use case, every field is required and editable //
+                     ////////////////////////////////////////////////////////////
+                     fieldMetaData.setIsRequired(true);
+                     fieldMetaData.setIsEditable(true);
+
+                     ///////////////////////////////////////////////////////////////////////
+                     // if we're in a context where there are values, then populate those //
+                     // e.g., a view screen instead of an edit screen, i think            //
+                     ///////////////////////////////////////////////////////////////////////
+                     if(defaultValues.containsKey(fieldName))
                      {
-                        qPossibleValueTranslator = new QPossibleValueTranslator();
+                        String value = defaultValues.get(fieldName);
+
+                        fieldMetaData.setDefaultValue(value);
+                        recordOfFieldValues.setValue(fieldName, value);
+
+                        //////////////////////////////////////////////////////
+                        // look up display values for possible value fields //
+                        //////////////////////////////////////////////////////
+                        if(StringUtils.hasContent(fieldMetaData.getPossibleValueSourceName()))
+                        {
+                           if(qPossibleValueTranslator == null)
+                           {
+                              qPossibleValueTranslator = new QPossibleValueTranslator();
+                           }
+                           String displayValue = qPossibleValueTranslator.translatePossibleValue(fieldMetaData, value);
+                           recordOfFieldValues.setDisplayValue(fieldName, displayValue);
+                        }
                      }
-                     String displayValue = qPossibleValueTranslator.translatePossibleValue(fieldMetaData, value);
+
-                     recordOfFieldValues.setDisplayValue(fieldName, displayValue);
+                     fieldList.add(fieldMetaData);
                   }
                }
-
-               fieldList.add(fieldMetaData);
             }
          }
 

qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/savedreports/RenderSavedReportExecuteStep.java

@@ -147,10 +147,10 @@ public class RenderSavedReportExecuteStep implements BackendStep
             .withReportFormat(reportFormat)
             .withReportOutputStream(outputStream));
 
-         //////////////////////////
+         //////////////////////////////////////////////////////////
-         // todo variable-values //
+         // todo variable-values                                 //
-         //////////////////////////
+         // actually, looks like they're coming in right here... //
-
+         //////////////////////////////////////////////////////////
          Map<String, Serializable> values = runBackendStepInput.getValues();
          reportInput.setInputValues(values);
 

qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/savedreports/RunScheduledReportExecuteStep.java

@@ -36,7 +36,9 @@ import com.kingsrook.qqq.backend.core.model.actions.processes.RunProcessOutput;
 import com.kingsrook.qqq.backend.core.model.data.QRecord;
 import com.kingsrook.qqq.backend.core.model.savedreports.ScheduledReport;
 import com.kingsrook.qqq.backend.core.utils.CollectionUtils;
+import com.kingsrook.qqq.backend.core.utils.JsonUtils;
 import com.kingsrook.qqq.backend.core.utils.StringUtils;
+import org.json.JSONObject;
 import static com.kingsrook.qqq.backend.core.logging.LogUtils.logPair;
 
 
@@ -83,9 +85,15 @@ public class RunScheduledReportExecuteStep implements BackendStep
 
          if(StringUtils.hasContent(scheduledReport.getInputValues()))
          {
-            //////////////////////////
+            /////////////////////////////////////////////////////////////////////////////////////
-            // todo variable-values //
+            // if there are input values, pass them along on report input...                   //
-            //////////////////////////
+            // this could maybe be better (e.g., some object?), but, this is working initially //
+            /////////////////////////////////////////////////////////////////////////////////////
+            JSONObject jsonObject = JsonUtils.toJSONObject(scheduledReport.getInputValues());
+            for(String name : jsonObject.keySet())
+            {
+               renderProcessInput.addValue(name, jsonObject.optString(name));
+            }
          }
 
          RunProcessOutput renderProcessOutput = runProcessAction.execute(renderProcessInput);