Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(#3063) Fix new dataset validation #3067

Merged
merged 1 commit into from
Jan 23, 2025
Merged

(#3063) Fix new dataset validation #3067

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion WebApp/WebContent/dataset/new_dataset.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
monthNavigator="true" yearNavigator="true"
onMonthChange="autoSelectDay"
onYearChange="autoSelectDay"
onchange="processNewDataSet('start');">
onchange="processNewDataSet('end');">
</p:datePicker>
</h:panelGrid>
<div id="errorList" class="errors hidden"></div>
Expand Down
64 changes: 38 additions & 26 deletions WebApp/WebContent/resources/script/dataSets.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ TIMELINE_OPTIONS = {
}
};

window['runValidation'] = true;

function drawTimeline() {
// Convert dates to date objects
dataSetJSON.map(function (row) {
Expand Down Expand Up @@ -98,39 +100,46 @@ function processNewDataSet(eventType) {
// Remove the existing entry
timeline.itemsData.remove(newDataSetItem);

if (null == PF('startDate').getDate()) {
newDataSetItem['start'] = null;
} else {
newDataSetItem['start'] = getDateField('startDate');
if (eventType == 'start') {
if (null == PF('startDate').getDate()) {
newDataSetItem['start'] = null;
} else {
newDataSetItem['start'] = getDateField('startDate');
var s = PF('pDataSetName').jq;
s.val(s.data('platform-code') + makeUTCyyyymmdd(newDataSetItem['start']));
newDataSetItem['content'] = s.val();
s.css('animationName', 'rowFlash').css('animationDuration', '1s');
}
}

// Always process the end date
// A timeline click triggers a Start event, but the End should also be processed
if (null == PF('endDate').getDate()) {
newDataSetItem['end'] = null;
} else {
newDataSetItem['end'] = getDateField('endDate');
}

let validData = validateNewDataSet();
if (eventType == 'start' || validData) {
newDataSetItem['className'] = 'goodNewDataSet';
$('#errorList').hide();
PF('pAddButton').enable();
} else {
newDataSetItem['className'] = 'badNewDataSet';
}
if (eventType == 'start') {
var s = PF('pDataSetName').jq;
s.val(s.data('platform-code') + makeUTCyyyymmdd(newDataSetItem['start']));
s.css('animationName', 'rowFlash').css('animationDuration', '1s');
}
newDataSetItem['content'] = PF('pDataSetName').jq.val().trim();
newDataSetItem['title'] = PF('pDataSetName').jq.val().trim();
if (newDataSetItem['start'] && newDataSetItem['end']
&& newDataSetItem['end'] > newDataSetItem['start']) {
timeline.itemsData.add(newDataSetItem);
}
if (eventType == 'submit' && validData) {
addDataSet();

if (window['runValidation']) {
let validData = validateNewDataSet();
if (validData) {
newDataSetItem['className'] = 'goodNewDataSet';
$('#errorList').hide();
PF('pAddButton').enable();
} else {
newDataSetItem['className'] = 'badNewDataSet';
}

newDataSetItem['content'] = PF('pDataSetName').jq.val().trim();
newDataSetItem['title'] = PF('pDataSetName').jq.val().trim();
if (newDataSetItem['start'] && newDataSetItem['end']
&& newDataSetItem['end'] > newDataSetItem['start']) {
timeline.itemsData.add(newDataSetItem);
}
if (eventType == 'submit' && validData) {
addDataSet();
}
}
}

Expand Down Expand Up @@ -348,11 +357,14 @@ function setRangeFromClick(date, datasets) {
max = max_file_date
}
if (!inside_existing) {
window['runValidation'] = false;
setDateField('startDate', min);
setDateField('endDate', max);
window['runValidation'] = true;
processNewDataSet('start');
}
else {
PF('invalidDatasetDlg').show();
PF('invalidDatasetDlg').show();
}
}

Expand Down
Loading