Skip to content

Style ODK-X Survey Instance Savepoints-types #210

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

Open
juayuohcarineneng19 wants to merge 5 commits into
base: development
Choose a base branch
from
Open

Style ODK-X Survey Instance Savepoints-types #210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6e4d4ac
style instance savepoint-types
juayuohcarineneng19 Jul 2, 2024
dec0de6
Add border radius to states
juayuohcarineneng19 Jul 13, 2024
6f7ab5f
add borders to states
juayuohcarineneng19 Jul 15, 2024
3062497
add borders to states
juayuohcarineneng19 Jul 15, 2024
9e88f06
Merge branch 'development' into savepoint-types
juayuohcarineneng19 Aug 15, 2024
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
26 changes: 26 additions & 0 deletions app/config/assets/css/odk-survey.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -632,3 +632,29 @@ Eventually we should make a jqm theme for this.
margin-right:50px;
}

.savepoints.finalized {
display: flex;
text-align: center;
align-items: center;
width: fit-content;
padding: 16px;
justify-content: center;
color: #1CCB3D;
background-color: #F0FDF2;
height: 40px;
border-radius: 15px
}

.savepoints.incomplete {
display: flex;
text-align: center;
align-items: center;
width: fit-content;
padding: 16px;
justify-content: center;
color: #DF961F;
background-color: #FCF8EA;
height: 40px;
border-radius: 15px
}

2 changes: 2 additions & 0 deletions app/system/survey/js/prompts.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -623,9 +623,11 @@ promptTypes.instances = promptTypes.base.extend({
if ( savepoint_type === opendatakit.savepoint_type_complete ) {
term.savepoint_type_text = that.savepoint_type_finalized_text;
term.is_checkpoint = false;
term.status_class = 'finalized';
} else if ( savepoint_type === opendatakit.savepoint_type_incomplete ) {
term.savepoint_type_text = that.savepoint_type_incomplete_text;
term.is_checkpoint = false;
term.status_class = 'incomplete';
} else {
term.savepoint_type_text = that.savepoint_type_checkpoint_text;
term.is_checkpoint = true;
Expand Down
3 changes: 2 additions & 1 deletion app/system/survey/templates/instances.handlebars
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@
<p><strong>{{display_field}}</strong></p>
{{{localizeText ../display.instances_last_save_date_label}}}
<p>{{savepoint_timestamp}}</p>
<p><strong>{{localizeText savepoint_type_text}}</strong></p>
<p class="savepoints {{status_class}}"><strong>{{localizeText savepoint_type_text}}</strong></p>

{{#if is_checkpoint}}
<span class="glyphicon glyphicon-warning-sign"></span></p>
{{/if}}
Expand Down