Merge branch 'feature/CE-1946-process-to-allow-post-wms-carton-contents-adjustments' into integration/sprint-54

This commit is contained in:
Tim Chamberlain
2024-11-19 20:40:27 -06:00
2 changed files with 21 additions and 4 deletions

View File

@ -334,6 +334,22 @@ function DashboardWidgets({widgetMetaDataList, tableName, entityPrimaryKey, reco
doOpenEditChildForm(name, widgetData.childTableMetaData, rowIndex, defaultValues, disabledFields);
}
/*******************************************************************************
**
*******************************************************************************/
function openAddChildRecord(name: string, widgetData: any)
{
let disabledFields = widgetData.disabledFieldsForNewChildRecords;
if (!disabledFields)
{
disabledFields = widgetData.defaultValuesForNewChildRecords;
}
doOpenEditChildForm(name, widgetData.childTableMetaData, null, null, disabledFields);
}
/*******************************************************************************
**
*******************************************************************************/
@ -693,11 +709,12 @@ function DashboardWidgets({widgetMetaDataList, tableName, entityPrimaryKey, reco
widgetMetaData.type === "childRecordList" && (
widgetData && widgetData[i] &&
<RecordGridWidget
disableRowClick={true}
allowRecordEdit={true}
disableRowClick={widgetData[i]?.disableRowClick}
allowRecordEdit={widgetData[i]?.allowRecordEdit}
allowRecordDelete={widgetData[i]?.allowRecordDelete}
deleteRecordCallback={(rowIndex) => deleteChildRecord(widgetMetaData.name, i, rowIndex)}
editRecordCallback={(rowIndex) => openEditChildRecord(widgetMetaData.name, widgetData[i], rowIndex)}
allowRecordDelete={true}
addNewRecordCallback={() => openAddChildRecord(widgetMetaData.name, widgetData[i])}
widgetMetaData={widgetMetaData}
data={widgetData[i]}
/>

View File

@ -26,7 +26,7 @@ import Divider from "@mui/material/Divider";
function DividerWidget(): JSX.Element
{
return (
<Box pl={3} pt={1} width="100%">
<Box pl={3} pt={3} pb={3} width="100%">
<Divider sx={{width: "100%", height: "1px", background: "grey"}} />
</Box>
);