Merge branch 'master' into TMSS-309

SAS/Scheduler/src/taskdialog.cpp

@@ -1655,6 +1655,8 @@ void TaskDialog::apply(bool close) {
 		close = false;
 	}
 	if (close) {
+		// SW-933
+		clearMultiTasks();
 		this->close();
 	}
 	else {
@@ -4647,6 +4649,9 @@ void TaskDialog::showMultiEdit(std::vector<Task *> &tasks) {
 	isMultiTasks = true;
 	enableTabs();
 
+	// SW-933
+	clearMultiTasks();
+
 	itsDataSlotDialog.clear();
 
     ui.lineEditCreationDate->clear();

SAS/TMSS/frontend/tmss_webapp/src/components/ViewTable.js

@@ -683,7 +683,7 @@ optionaldataheader.forEach(header => {
     columns.push({
       Header: isString ? optionalheader[0][header] : optionalheader[0][header].name,
       id: isString ? header : optionalheader[0][header].name,
-      accessor: header,
+      accessor: isString ? header : optionalheader[0][header].name, 
       filter: filtertype,
       Filter: filterFn,
       isVisible: false,

SAS/TMSS/frontend/tmss_webapp/src/layout/sass/_timeline.scss

@@ -37,7 +37,7 @@
 }
 
 .timeline-filters button {
-    width: auto !important;
+    // width: auto !important;
 }
 
 .timeline-week-span {

SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/Scheduling.Constraints.js

@@ -116,8 +116,12 @@ export default (props) => {
                 list.push('disable-field');
             }
             ref.editors['root.time.at'].container.className = list.join(' ');
+            Array.prototype.slice.call(ref.editors['root.time.at'].control.getElementsByTagName('input')).forEach(input => input.disabled = true);
+            Array.prototype.slice.call(ref.editors['root.time.at'].control.getElementsByTagName('button')).forEach(button => button.disabled = true);
         } else {
             ref.editors['root.time.at'].container.className = ref.editors['root.time.at'].container.className.replace('disable-field', '');
+            Array.prototype.slice.call(ref.editors['root.time.at'].control.getElementsByTagName('input')).forEach(input => input.disabled = false);
+            Array.prototype.slice.call(ref.editors['root.time.at'].control.getElementsByTagName('button')).forEach(button => button.disabled = false);
         }
         if (props.callback) {
             props.callback(jsonOutput, errors);

SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/week.view.js

@@ -144,8 +144,8 @@ export class WeekTimelineView extends Component {
             name: suBlueprint.suDraft.name,
             band: antennaSet,
             duration: suBlueprint.durationInSec?`${(suBlueprint.durationInSec/3600).toFixed(2)}Hrs`:"",
-            start_time: moment.utc(`${displayDate.format('MM-DD-YYYY')} ${suBlueprint.start_time.split('T')[1]}`),
-            end_time: moment.utc(`${displayDate.format('MM-DD-YYYY')} ${suBlueprint.stop_time.split('T')[1]}`),
+            start_time: moment.utc(`${displayDate.format('YYYY-MM-DD')} ${suBlueprint.start_time.split('T')[1]}`),
+            end_time: moment.utc(`${displayDate.format('YYYY-MM-DD')} ${suBlueprint.stop_time.split('T')[1]}`),
             bgColor: suBlueprint.status? STATUS_COLORS[suBlueprint.status.toUpperCase()]:"#2196f3",
             selectedBgColor: suBlueprint.status? STATUS_COLORS[suBlueprint.status.toUpperCase()]:"#2196f3"}; 
         return item;