Skip to content
Snippets Groups Projects
Commit 12f61e78 authored by Reinder Kraaij's avatar Reinder Kraaij :eye:
Browse files

Merge branch 'TMSS-3053-Front-End-Only' into 'master' 

Fixed Blue Print Copy

Closes TMSS-3053

See merge request !1403
parents 77ca14e7 7272beb5
No related branches found
No related tags found
1 merge request!1403Fixed Blue Print Copy
Hide whitespace changes
Inline Side-by-side
SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/Business/actions/advancecopy.js
+ 2
− 2
View file @ 12f61e78
......@@ -90,7 +90,7 @@ export function AdvancedCopyActionButton(props) {
let xdialog = dialog;
xdialog.type = "confirmation";
xdialog.header = "Advanced Copy Scheduling Unit";
if (suType === 'Draft') {
if (suType === 'draft') {
xdialog.detail = "Select the Project and Scheduling set to which you want to copy this Scheduling Unit draft(s)";
} else {
xdialog.detail = "Copying Scheduling Unit Blueprint(s) will create new Scheduling Unit Draft(s). Select the Project and Scheduling set to which you want to copy this Scheduling Unit blueprint(s)"
......@@ -151,7 +151,7 @@ export function AdvancedCopyActionButton(props) {
for (const item of selectedRows) {
try {
let response = null;
if (suType === 'Draft') {
if (suType === 'draft') {
response = await ScheduleService.copySchedulingUnitDraft(item.id, param);
} else {
response = await ScheduleService.copySchedulingUnitBluePrint(item.id, param);
......
SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/Business/actions/copyschedulingunit.js
+ 2
− 2
View file @ 12f61e78
......@@ -15,7 +15,7 @@ export function CopySchedulingUnitActionButton(props) {
let xdialog = dialog;
xdialog.type = "confirmation";
xdialog.header = "Confirm to Copy Scheduling Unit(s)";
if (suType === 'Draft') {
if (suType === 'draft') {
xdialog.detail = "Do you want to copy the selected Scheduling Unit " + suType + "?";
} else {
xdialog.detail = "Copying Scheduling Unit Blueprint(s) will create new Scheduling Unit Draft(s). Do you want to proceed?"
......@@ -76,7 +76,7 @@ const getSUCopyStatusContent = () => {
try {
let response = null;
let param = {};
if (suType === 'Draft') {
if (suType === 'draft') {
response = await ScheduleService.copySchedulingUnitDraft(item.id, param);
} else {
response = await ScheduleService.copySchedulingUnitBluePrint(item.id, param);
......
SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/components/actionbuttons.js
+ 9
− 9
View file @ 12f61e78
......@@ -40,11 +40,11 @@ import { Button } from "primereact/button";
const ActionButtonsBluePrint = () => {
if (suType !== 'blueprint') return
return <>
<CopyFailedTasksActionButton spinnerPercent={spinnerPercent} setDialogVisible={setDialogVisible} setPageUpdated={setPageUpdated} setDialog={setDialog} suPermissions={suPermissions} closeDialog={closeDialog} dialog={dialog} selectedRows={selectedRows} setShowSpinner={setShowSpinner}/>
<CopySpecAndFailedTaskActionButton setDialogVisible={setDialogVisible} setPageUpdated={setPageUpdated} setDialog={setDialog} suPermissions={suPermissions} closeDialog={closeDialog} dialog={dialog} selectedRows={selectedRows} setShowSpinner={setShowSpinner}></CopySpecAndFailedTaskActionButton>
<UpdateBluePrintActionButton setDialogVisible={setDialogVisible} setPageUpdated={setPageUpdated} setDialog={setDialog} suPermissions={suPermissions} closeDialog={closeDialog} dialog={dialog} selectedRows={selectedRows} setShowSpinner={setShowSpinner}></UpdateBluePrintActionButton>
<CleanUpTaskActionButton setDialogVisible={setDialogVisible} setPageUpdated={setPageUpdated} setDialog={setDialog} suPermissions={suPermissions} closeDialog={closeDialog} dialog={dialog} selectedRows={selectedRows} ></CleanUpTaskActionButton>
<ConfirmCancelSchedulingUnitActionButton setScheduleunit={setScheduleunit} setSelectedRows={setSelectedRows} dialogVisible={dialogVisible} scheduleunit={scheduleunit} setDialogVisible={setDialogVisible} setPageUpdated={setPageUpdated} setDialog={setDialog} suPermissions={suPermissions} closeDialog={closeDialog} dialog={dialog} selectedRows={selectedRows} setShowSpinner={setShowSpinner}></ConfirmCancelSchedulingUnitActionButton> </>
<CopyFailedTasksActionButton spinnerPercent={spinnerPercent} setDialogVisible={setDialogVisible} setPageUpdated={setPageUpdated} setDialog={setDialog} suPermissions={suPermissions} closeDialog={closeDialog} dialog={dialog} selectedRows={selectedRows} setShowSpinner={setShowSpinner}/>
<CopySpecAndFailedTaskActionButton suType={suType} setDialogVisible={setDialogVisible} setPageUpdated={setPageUpdated} setDialog={setDialog} suPermissions={suPermissions} closeDialog={closeDialog} dialog={dialog} selectedRows={selectedRows} setShowSpinner={setShowSpinner}></CopySpecAndFailedTaskActionButton>
<UpdateBluePrintActionButton suType={suType} setDialogVisible={setDialogVisible} setPageUpdated={setPageUpdated} setDialog={setDialog} suPermissions={suPermissions} closeDialog={closeDialog} dialog={dialog} selectedRows={selectedRows} setShowSpinner={setShowSpinner}></UpdateBluePrintActionButton>
<CleanUpTaskActionButton suType={suType} setDialogVisible={setDialogVisible} setPageUpdated={setPageUpdated} setDialog={setDialog} suPermissions={suPermissions} closeDialog={closeDialog} dialog={dialog} selectedRows={selectedRows} ></CleanUpTaskActionButton>
<ConfirmCancelSchedulingUnitActionButton suType={suType} setScheduleunit={setScheduleunit} setSelectedRows={setSelectedRows} dialogVisible={dialogVisible} scheduleunit={scheduleunit} setDialogVisible={setDialogVisible} setPageUpdated={setPageUpdated} setDialog={setDialog} suPermissions={suPermissions} closeDialog={closeDialog} dialog={dialog} selectedRows={selectedRows} setShowSpinner={setShowSpinner}></ConfirmCancelSchedulingUnitActionButton> </>
}
......@@ -53,10 +53,10 @@ import { Button } from "primereact/button";
if (suType == 'constraints') return
return <>
<AutoDeleteActionButton closeDialog={closeDialog} suType={suType} RequestRefresh={RequestRefresh} dialogVisible={dialogVisible} scheduleunit={scheduleunit} setDialogVisible={setDialogVisible} setPageUpdated={setPageUpdated} setDialog={setDialog} suPermissions={suPermissions} dialog={dialog} selectedRows={selectedRows} setShowSpinner={setShowSpinner}></AutoDeleteActionButton>
<CopySchedulingUnitActionButton RequestRefresh={RequestRefresh} dialogVisible={dialogVisible} scheduleunit={scheduleunit} setDialogVisible={setDialogVisible} setPageUpdated={setPageUpdated} setDialog={setDialog} suPermissions={suPermissions} closeDialog={closeDialog} dialog={dialog} selectedRows={selectedRows} setShowSpinner={setShowSpinner}></CopySchedulingUnitActionButton>
<AdvancedCopyActionButton priorityQueueTypes={priorityQueueTypes} spinnerPercent={spinnerPercent} setSpinnerPercent={setSpinnerPercent} projects={projects} setProjectSchedSets={setProjectSchedSets} projectSchedSets={projectSchedSets} RequestRefresh={RequestRefresh} dialogVisible={dialogVisible} scheduleunit={scheduleunit} setDialogVisible={setDialogVisible} setPageUpdated={setPageUpdated} setDialog={setDialog} suPermissions={suPermissions} closeDialog={closeDialog} dialog={dialog} selectedRows={selectedRows} setShowSpinner={setShowSpinner} ></AdvancedCopyActionButton>
<MoveActionButton project={project} schUnits={schUnits} priorityQueueTypes={priorityQueueTypes} spinnerPercent={spinnerPercent} setSpinnerPercent={setSpinnerPercent} projects={projects} setProjectSchedSets={setProjectSchedSets} projectSchedSets={projectSchedSets} RequestRefresh={RequestRefresh} dialogVisible={dialogVisible} scheduleunit={scheduleunit} setDialogVisible={setDialogVisible} setPageUpdated={setPageUpdated} setDialog={setDialog} suPermissions={suPermissions} closeDialog={closeDialog} dialog={dialog} selectedRows={selectedRows} setShowSpinner={setShowSpinner}></MoveActionButton>
<DeleteSchedulingUnitActionButton setSelectedRows={setSelectedRows} RequestRefresh={RequestRefresh} setScheduleunit={setScheduleunit} setSelectedRowsv={setSelectedRows} scheduleunit={scheduleunit} project={project} schUnits={schUnits} priorityQueueTypes={priorityQueueTypes} spinnerPercent={spinnerPercent} setSpinnerPercent={setSpinnerPercent} projects={projects} setProjectSchedSets={setProjectSchedSets} projectSchedSets={projectSchedSets} dialogVisible={dialogVisible} setDialogVisible={setDialogVisible} setPageUpdated={setPageUpdated} setDialog={setDialog} suPermissions={suPermissions} closeDialog={closeDialog} dialog={dialog} selectedRows={selectedRows} setShowSpinner={setShowSpinner}></DeleteSchedulingUnitActionButton>
<CopySchedulingUnitActionButton suType={suType} RequestRefresh={RequestRefresh} dialogVisible={dialogVisible} scheduleunit={scheduleunit} setDialogVisible={setDialogVisible} setPageUpdated={setPageUpdated} setDialog={setDialog} suPermissions={suPermissions} closeDialog={closeDialog} dialog={dialog} selectedRows={selectedRows} setShowSpinner={setShowSpinner}></CopySchedulingUnitActionButton>
<AdvancedCopyActionButton suType={suType} priorityQueueTypes={priorityQueueTypes} spinnerPercent={spinnerPercent} setSpinnerPercent={setSpinnerPercent} projects={projects} setProjectSchedSets={setProjectSchedSets} projectSchedSets={projectSchedSets} RequestRefresh={RequestRefresh} dialogVisible={dialogVisible} scheduleunit={scheduleunit} setDialogVisible={setDialogVisible} setPageUpdated={setPageUpdated} setDialog={setDialog} suPermissions={suPermissions} closeDialog={closeDialog} dialog={dialog} selectedRows={selectedRows} setShowSpinner={setShowSpinner} ></AdvancedCopyActionButton>
<MoveActionButton suType={suType} project={project} schUnits={schUnits} priorityQueueTypes={priorityQueueTypes} spinnerPercent={spinnerPercent} setSpinnerPercent={setSpinnerPercent} projects={projects} setProjectSchedSets={setProjectSchedSets} projectSchedSets={projectSchedSets} RequestRefresh={RequestRefresh} dialogVisible={dialogVisible} scheduleunit={scheduleunit} setDialogVisible={setDialogVisible} setPageUpdated={setPageUpdated} setDialog={setDialog} suPermissions={suPermissions} closeDialog={closeDialog} dialog={dialog} selectedRows={selectedRows} setShowSpinner={setShowSpinner} ></MoveActionButton>
<DeleteSchedulingUnitActionButton suType={suType} setSelectedRows={setSelectedRows} RequestRefresh={RequestRefresh} setScheduleunit={setScheduleunit} setSelectedRowsv={setSelectedRows} scheduleunit={scheduleunit} project={project} schUnits={schUnits} priorityQueueTypes={priorityQueueTypes} spinnerPercent={spinnerPercent} setSpinnerPercent={setSpinnerPercent} projects={projects} setProjectSchedSets={setProjectSchedSets} projectSchedSets={projectSchedSets} dialogVisible={dialogVisible} setDialogVisible={setDialogVisible} setPageUpdated={setPageUpdated} setDialog={setDialog} suPermissions={suPermissions} closeDialog={closeDialog} dialog={dialog} selectedRows={selectedRows} setShowSpinner={setShowSpinner}></DeleteSchedulingUnitActionButton>
</>
}
......
SAS/TMSS/frontend/tmss_webapp/src/routes/Task/view.js
+ 0
− 1
View file @ 12f61e78
......@@ -157,7 +157,6 @@ export class TaskView extends Component {
}
onRowSelection(selectedRows) {
this.selectedRows = selectedRows;
}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment