diff --git a/.vscode/ftp-kr.sync.cache.json b/.vscode/ftp-kr.sync.cache.json index 19fe1c8..5f0abf9 100644 --- a/.vscode/ftp-kr.sync.cache.json +++ b/.vscode/ftp-kr.sync.cache.json @@ -271,6 +271,22 @@ "lmtime": 1732087463330, "modified": false } + }, + "projects": { + "task-edit.php": { + "type": "-", + "size": 7738, + "lmtime": 1732274648412, + "modified": false + } + }, + "tasks": { + "task_edit.php": { + "type": "-", + "size": 7636, + "lmtime": 1732274652144, + "modified": false + } } }, "upload": {} diff --git a/autoload/controls/class.Finances.php b/autoload/controls/class.Finances.php index 0f985d0..9c2bb58 100644 --- a/autoload/controls/class.Finances.php +++ b/autoload/controls/class.Finances.php @@ -168,7 +168,7 @@ class Finances $tag_id = \S::get_session( 'finance-tag-id' ); $client_id = \S::get_session( 'finance_client_id' ); $dates = \S::get_session( 'finance-dates' ); - $dates = explode( ' - ', $dates ); + $dates = explode( '_-_', $dates ); $dates[0] ? $date_from = $dates[0] : $date_from = date( 'Y-m-01' ); $dates[1] ? $date_to = $dates[1] : $date_to = date( 'Y-m-t' ); diff --git a/templates/finances/main-view.php b/templates/finances/main-view.php index b3bd124..2d39ae3 100644 --- a/templates/finances/main-view.php +++ b/templates/finances/main-view.php @@ -331,7 +331,9 @@ $(function() { }); $('body').on('change', '.date-range', function() { - document.location.href = '/finances/main_view/dates=' + $(this).val(); + // replace spaces + var date = $(this).val().replace(/ /g, '_'); + document.location.href = '/finances/main_view/dates=' + date; }); jQuery('body').on('click', '.date-range-icon', function() { diff --git a/templates/site/layout-logged.php b/templates/site/layout-logged.php index df2c59b..1ce07f9 100644 --- a/templates/site/layout-logged.php +++ b/templates/site/layout-logged.php @@ -22,6 +22,7 @@ +