QRunIO/qqq
2
0
Fork 0
mirror of https://github.com/Kingsrook/qqq.git synced 2025-07-18 13:10:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
darin.kelkhoff
2024-04-30 20:29:30 -05:00
parent a607f35805
commit 77689dd75e
3 changed files with 63 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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,14 +122,10 @@ public class ReportValuesDynamicFormWidgetRenderer extends AbstractWidgetRendere
///////////////////////////////////////////////////////////////////////////////////////////////
for(QFilterCriteria criteria : CollectionUtils.nonNullList(queryFilter.getCriteria()))
{
/////////////////////////////////
// todo - only variable fields //
/////////////////////////////////
////////////////////////////////
// todo - twice for "between" //
////////////////////////////////
for(Serializable criteriaValue : CollectionUtils.nonNullList(criteria.getValues()))
{
if(criteriaValue instanceof FilterVariableExpression filterVariableExpression)
{
//////////////////////////
// todo - join fields!! //
//////////////////////////
@ -134,11 +134,9 @@ public class ReportValuesDynamicFormWidgetRenderer extends AbstractWidgetRendere
/////////////////////////////////
// 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("_", " ");
String fieldName = filterVariableExpression.getVariableName();
fieldMetaData.setName(fieldName);
fieldMetaData.setLabel(label);
fieldMetaData.setLabel(QInstanceEnricher.nameToLabel(filterVariableExpression.getVariableName()));
////////////////////////////////////////////////////////////
// in this use case, every field is required and editable //
@ -146,6 +144,10 @@ public class ReportValuesDynamicFormWidgetRenderer extends AbstractWidgetRendere
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))
{
String value = defaultValues.get(fieldName);
@ -170,6 +172,8 @@ public class ReportValuesDynamicFormWidgetRenderer extends AbstractWidgetRendere
fieldList.add(fieldMetaData);
}
}
}
}
///////////////////////////////////
// make output object and return //

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

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

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

@ -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);