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

Update offer claim UI to reflect default times (start: now, max: 1 day) #34

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Update offer claim UI to reflect default times (start: now, max: 1 day) #34

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
101 changes: 61 additions & 40 deletions esi_ui/static/dashboard/esi/lessee/offers/claim/claim-wizard.controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,45 +5,66 @@
.module('horizon.dashboard.esi.lessee.offers.claim')
.controller('ClaimWizardController', ClaimWizardController);

ClaimWizardController.$inject = [
'$scope',
'horizon.dashboard.esi.lessee.offers.claim.workflow',
];

function ClaimWizardController($scope, claimWorkflow) {
$scope.workflow = claimWorkflow;
$scope.submit = submit;

function submit(stepModels) {
var start = null;
var end = null;

if (stepModels.start_date) {
start = new Date();
start.setUTCFullYear(stepModels.start_date.getUTCFullYear());
start.setUTCMonth(stepModels.start_date.getUTCMonth());
start.setUTCDate(stepModels.start_date.getUTCDate());
start.setUTCHours(stepModels.start_time.getHours());
start.setUTCMinutes(stepModels.start_time.getMinutes());
start.setUTCSeconds(0);
start.setUTCMilliseconds(0);
}
if (stepModels.end_date) {
end = new Date();
end.setUTCFullYear(stepModels.end_date.getUTCFullYear());
end.setUTCMonth(stepModels.end_date.getUTCMonth());
end.setUTCDate(stepModels.end_date.getUTCDate());
end.setUTCHours(stepModels.end_time.getHours());
end.setUTCMinutes(stepModels.end_time.getMinutes());
end.setUTCSeconds(0);
end.setUTCMilliseconds(0);
}
ClaimWizardController.$inject = [
'$scope',
'horizon.dashboard.esi.lessee.offers.claim.workflow',
];

return Promise.resolve({
start_time: start,
end_time: end
});
}
}
function ClaimWizardController($scope, claimWorkflow) {
$scope.workflow = claimWorkflow;
$scope.submit = submit;

const now = new Date();
const defaultEnd = new Date(now);
defaultEnd.setDate(now.getDate() + 1);
defaultEnd.setUTCHours(now.getUTCHours());
defaultEnd.setUTCMinutes(now.getUTCMinutes());
defaultEnd.setUTCSeconds(0);
defaultEnd.setUTCMilliseconds(0);

$scope.defaultStart = {
date: new Date(now),
time: now.toISOString().substr(11, 5)
};

$scope.defaultEnd = {
date: new Date(defaultEnd),
time: defaultEnd.toISOString().substr(11, 5)
};

})();
$scope.stepModels = {
start_date: $scope.defaultStart.date,
start_time: $scope.defaultStart.time,
end_date: $scope.defaultEnd.date,
end_time: $scope.defaultEnd.time
};

function submit(stepModels) {
let start = null;
let end = null;

if (stepModels.start_date && stepModels.start_time) {
start = new Date(stepModels.start_date);
const [startHour, startMinute] = stepModels.start_time.split(':');
start.setUTCHours(parseInt(startHour, 10));
start.setUTCMinutes(parseInt(startMinute, 10));
start.setUTCSeconds(0);
start.setUTCMilliseconds(0);
}

if (stepModels.end_date && stepModels.end_time) {
end = new Date(stepModels.end_date);
const [endHour, endMinute] = stepModels.end_time.split(':');
end.setUTCHours(parseInt(endHour, 10));
end.setUTCMinutes(parseInt(endMinute, 10));
end.setUTCSeconds(0);
end.setUTCMilliseconds(0);
}

return Promise.resolve({
start_time: start,
end_time: end
});
}
}
})();
18 changes: 9 additions & 9 deletions esi_ui/static/dashboard/esi/lessee/offers/claim/claim.html
View file
Open in desktop
Copy link
Collaborator

@sheldor1510 sheldor1510 Jan 16, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why are all the input fields in this form required and not conditionally ng-required like they were before? I can't submit the form to claim the offer even when the default times are filled as the claim button is disabled. It seems the input fields are not recognizing the default values.

Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
<p class="step-description" translate>Please provide time a period to claim</p>

<div class="form-group">
<label class="control-label" translate for="start">Start Time (UTC)</label>
<label class="control-label" for="start">Start Time (UTC)</label>
<br>
<input type="date" id="start" ng-model="stepModels.start_date" />
<input type="time" id="start" ng-required="stepModels.start_date" ng-model="stepModels.start_time" />
<span translate>Default: now</span>
<input type="date" id="start-date" ng-model="stepModels.start_date" ng-value="defaultStart.date | date:'yyyy-MM-dd'" required />
<input type="time" id="start-time" ng-model="stepModels.start_time" ng-value="defaultStart.time" required />
<span>Default: now</span>
</div>

<div class="form-group">
<label class="control-label" translate for="end">End Time (UTC)</label>
<label class="control-label" for="end">End Time (UTC)</label>
<br>
<input type="date" id="end" ng-model="stepModels.end_date" />
<input type="time" id="end" ng-required="stepModels.end_date" ng-model="stepModels.end_time" />
<span translate>Default: offer end time</span>
</div>
<input type="date" id="end-date" ng-model="stepModels.end_date" ng-value="defaultEnd.date | date:'yyyy-MM-dd'" required />
<input type="time" id="end-time" ng-model="stepModels.end_time" ng-value="defaultEnd.time" required />
<span>Default: offer end time</span>
</div>