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

Js fixes and updates #78

Merged
merged 4 commits into from
Sep 14, 2023
Merged

Js fixes and updates #78

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ba42cf5
calendar first day
clavay Sep 12, 2023
9acbe11
fix setting text for boolean value
clavay Sep 12, 2023
77f383d
aggregation type
clavay Sep 12, 2023
3b041ef
Fix day name order and let first day to monday
clavay Sep 14, 2023
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
6 changes: 3 additions & 3 deletions pyscada/hmi/static/pyscada/js/pyscada/pyscada_v0-7-0rc14.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -789,7 +789,7 @@ var store_temp_ajax_data = null;
}
// Set the text value
document.querySelector("#" + control_item_id).innerHTML = r_val + " " + unit;
}else if(typeof(val)==="boolean"){
}else if(typeof(val)==="boolean" && e.querySelector('.boolean-value') != null){
// Set the text value
e.querySelector('.boolean-value').innerHTML = ci_label + " : " + dictionary(var_id, val, type.replace('-', '')) + " " + unit;
}
Expand Down Expand Up @@ -2802,7 +2802,7 @@ function createOffset(date) {
"November",
"December"
],
"firstDay": 1
"firstDay": 0
Copy link
Collaborator

Choose a reason for hiding this comment

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

this is only the default in most of europe, maybe it ist better to get that info from the locaton settings of the browser?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Do you know how and compatible with many browsers ?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

See : https://stackoverflow.com/questions/53382465/how-can-i-determine-if-week-starts-on-monday-or-sunday-based-on-locale-in-pure-j

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

As the current config is "daysOfWeek": [ "Mo", "Tu", "We", "Th", "Fr", "Sa", "Su", ],
The current setting is showing Tuesday as the first day of the week.

So we can change it to Monday or Sunday till we found how to set it accordingly to the browser settings.

This PR propose Monday.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I add a new commit to correct a bug about naming the days.
The day list in the JS datetimepicker config should start on sunday.

I think you can approve this request to fix this bug and then we plan in github discussion or project to get the browser locale to set the first week day.

What do you think @trombastic ?

Copy link
Collaborator

Choose a reason for hiding this comment

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

Okay

},
"alwaysShowCalendars": true,
"linkedCalendars": false,
Expand Down Expand Up @@ -3001,7 +3001,7 @@ function setAggregatedLists() {
b=filter_aggregation_type_for_period_list(a);
for (v in b) {
c[cc].add(new Option(b[v], v));
if (!document.querySelectorAll('#aggregation-type-all-select-' + widget_id + ' option[value="' + v + '"]').length) {
if (document.querySelector('#aggregation-type-all-select-' + widget_id) != null && !document.querySelectorAll('#aggregation-type-all-select-' + widget_id + ' option[value="' + v + '"]').length) {
document.querySelector('#aggregation-type-all-select-' + widget_id).add(new Option(b[v], v));
}
}
Expand Down