Merge pull request #158 from vsimakhin/feature/date-picker-start-week…

…-settings Date Range Picker first day of the week settings - Sunday or Monday
vsimakhin · Sep 17, 2023 · 908b63d · 908b63d
2 parents 2f0dd65 + 75821cf
commit 908b63d
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## [Unreleased]
 
+- New: Date Range Picker first day of the week settings - Sunday or Monday.
 - New: Attachments synchronization support for the mobile application.
 
 ## [2.25.0]

diff --git a/cmd/web/templates/flight-record-js.partials.gohtml b/cmd/web/templates/flight-record-js.partials.gohtml
@@ -1,4 +1,5 @@
 {{define "flight-record-js"}}
+{{$settings := index .Data "settings"}}
 <script>
 
 // WebLogbook FlightRecord Namespace
@@ -398,7 +399,8 @@ wlbFlightRecord = function () {
             singleDatePicker: true,
             showDropdowns: true,
             locale: {
-                format: 'DD/MM/YYYY'
+                format: 'DD/MM/YYYY',
+                firstDay: parseInt({{if not $settings.DateRangePickerWeek}}"0"{{else}}{{$settings.DateRangePickerWeek}}{{end}})
             },
             autoApply: true,
         }, function(start, end, label) {

diff --git a/cmd/web/templates/license-record-js.partials.gohtml b/cmd/web/templates/license-record-js.partials.gohtml
@@ -1,4 +1,5 @@
 {{define "license-record-js"}}
+{{$settings := index .Data "settings"}}
 <script>
 
 // WebLogbook License Record Namespace
@@ -150,6 +151,7 @@ wlbLicenseRecord = function () {
             showDropdowns: true,
             locale: {
                 format: 'DD/MM/YYYY',
+                firstDay: parseInt({{if not $settings.DateRangePickerWeek}}"0"{{else}}{{$settings.DateRangePickerWeek}}{{end}})
             },
             autoUpdateInput: false,
             autoApply: true,
@@ -171,6 +173,7 @@ wlbLicenseRecord = function () {
             showDropdowns: true,
             locale: {
                 format: 'DD/MM/YYYY',
+                firstDay: parseInt({{if not $settings.DateRangePickerWeek}}"0"{{else}}{{$settings.DateRangePickerWeek}}{{end}})
             },
             autoUpdateInput: false,
             autoApply: true,
@@ -192,6 +195,7 @@ wlbLicenseRecord = function () {
             showDropdowns: true,
             locale: {
                 format: 'DD/MM/YYYY',
+                firstDay: parseInt({{if not $settings.DateRangePickerWeek}}"0"{{else}}{{$settings.DateRangePickerWeek}}{{end}})
             },
             autoUpdateInput: false,
             autoApply: true,

diff --git a/cmd/web/templates/logbook-js.partials.gohtml b/cmd/web/templates/logbook-js.partials.gohtml
@@ -67,7 +67,8 @@ wlbLogbook = function () {
                     alwaysShowCalendars: true,
                     linkedCalendars: false,
                     locale: {
-                        cancelLabel: 'Clear'
+                        cancelLabel: 'Clear',
+                        firstDay: parseInt({{if not $settings.DateRangePickerWeek}}"0"{{else}}{{$settings.DateRangePickerWeek}}{{end}})
                     }
                 }, function(start, end, label) {
                     startDate = start;

diff --git a/cmd/web/templates/map-js.partials.gohtml b/cmd/web/templates/map-js.partials.gohtml
@@ -1,4 +1,5 @@
 {{define "map-js"}}
+{{$settings := index .Data "settings"}}
 <script src="/static/js/ol.js"></script>
 <script>
 
@@ -249,6 +250,9 @@ wlbMap = function () {
             linkedCalendars: false,
             startDate: start,
             endDate: end,
+            locale: {
+                firstDay: parseInt({{if not $settings.DateRangePickerWeek}}"0"{{else}}{{$settings.DateRangePickerWeek}}{{end}})
+            }
         });
 
         $('input[name="daterange"]').on('apply.daterangepicker', function(ev, picker) {

diff --git a/cmd/web/templates/settings-js.partials.gohtml b/cmd/web/templates/settings-js.partials.gohtml
@@ -206,6 +206,7 @@ wlbSettings = function () {
             logbook_font_size: document.getElementById("logbook_font").value,
             logbook_rows: document.getElementById("logbook_rows").value,
             licensing_rows: document.getElementById("licensing_rows").value,
+            datepicker_week: document.getElementById("datepicker_week").value,
             sync_options: {
                 keep_deleted_records_days: parseInt(document.getElementById("keep_deleted_records_days").value)
             }

diff --git a/cmd/web/templates/settings-misc.partials.gohtml b/cmd/web/templates/settings-misc.partials.gohtml
@@ -109,6 +109,15 @@
                 <input type="number" class="form-control form-control-sm" id="stats_font" name="stats_font" value='{{if not $settings.StatsFontSize}}100{{else}}{{$settings.StatsFontSize}}{{end}}' min="50" max="100">
             </div>
         </div>
+        <div class="row mb-1">
+            <label for="datepicker_week" class="col-sm-9 col-form-label">Date range picker week starts on</label>
+            <div class="col-sm-3">
+                <select class="form-control form-control-sm" id="datepicker_week" name="datepicker_week" value="{{if not $settings.DateRangePickerWeek}}0{{else}}{{$settings.DateRangePickerWeek}}{{end}}">
+                    <option value="0" {{if not $settings.DateRangePickerWeek}}selected{{else}}{{if eq $settings.DateRangePickerWeek "0"}}selected{{end}}{{end}}>Sunday</option>
+                    <option value="1" {{if eq $settings.DateRangePickerWeek "1"}}selected{{end}}>Monday</option>
+                </select>
+            </div>
+        </div>
     </div>
 </div>
 {{end}}
diff --git a/cmd/web/templates/stats-js.partials.gohtml b/cmd/web/templates/stats-js.partials.gohtml
@@ -288,7 +288,8 @@ $(document).ready( function () {
         alwaysShowCalendars: true,
         linkedCalendars: false,
         locale: {
-            cancelLabel: 'Clear'
+            cancelLabel: 'Clear',
+            firstDay: parseInt({{if not $settings.DateRangePickerWeek}}"0"{{else}}{{$settings.DateRangePickerWeek}}{{end}})
         }
     }, function(start, end, label) {
         startDate = start;

diff --git a/internal/models/structs.go b/internal/models/structs.go
@@ -199,11 +199,12 @@ type Settings struct {
 	ExportXLS ExportXLS `json:"export_xls"`
 	ExportCSV ExportCSV `json:"export_csv"`
 
-	HideStatsFields HideFields `json:"hide_stats_fields"`
-	StatsFontSize   string     `json:"stats_font_size"`
-	LogbookFontSize string     `json:"logbook_font_size"`
-	LogbookRows     string     `json:"logbook_rows"`
-	LicensingRows   string     `json:"licensing_rows"`
+	HideStatsFields     HideFields `json:"hide_stats_fields"`
+	StatsFontSize       string     `json:"stats_font_size"`
+	LogbookFontSize     string     `json:"logbook_font_size"`
+	LogbookRows         string     `json:"logbook_rows"`
+	LicensingRows       string     `json:"licensing_rows"`
+	DateRangePickerWeek string     `json:"datepicker_week"`
 
 	SyncOptions SyncOptions `json:"sync_options"`
 }