add formatting to importer descriptions, change reporting group limit…

… for months
solidtime-io · Jun 10, 2024 · 91cb6ab · 91cb6ab
1 parent fadcd04
commit 91cb6ab
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 17 deletions.
diff --git a/lang/en/importer.php b/lang/en/importer.php
@@ -5,31 +5,31 @@
 return [
     'clockify_time_entries' => [
         'name' => 'Clockify Time Entries',
-        'description' => 'First make sure that you set the Date format to "MM/DD/YYYY" and the Time format to "12-hour" in the user settings. '.
-            'Go to REPORTS -> TIME -> Detailed in the navigation on the left. '.
-            'Now select the date range that you want to export in the right top. '.
+        'description' => '1. First make sure that you set the Date format to "MM/DD/YYYY" and the Time format to "12-hour" in the user settings.<br> '.
+            '2. Go to REPORTS -> TIME -> Detailed in the navigation on the left. <br>'.
+            '3. Now select the date range that you want to export in the right top. '.
             'It is currently not possible to select more than one year. You can export each year separately and import them one after another .'.
-            'Now click Export -> Save as CSV. The Export dropdown is in the header of the export table left of the printer symbol. '.
-            'Before you import make sure that the Timezone settings in Clockify are the same as in solidtime.',
+            '<br> 4. Now click Export -> Save as CSV. The Export dropdown is in the header of the export table left of the printer symbol. '.
+            '<br><br>Before you import make sure that the Timezone settings in Clockify are the same as in solidtime.',
     ],
     'clockify_projects' => [
         'name' => 'Clockify Projects',
-        'description' => 'Go to PROJECTS in the navigation on the left. '.
-            'Now click on the three dots on the right of the project that you want to export and select Export. '.
-            'Now click Export -> Save as CSV. The Export dropdown is in the header of the export table in the top right corner.',
+        'description' => '1. Go to PROJECTS in the navigation on the left.<br> '.
+            '2. Now click on the three dots on the right of the project that you want to export and select Export.<br> '.
+            '3. Now click Export -> Save as CSV. The Export dropdown is in the header of the export table in the top right corner.',
     ],
     'toggl_data_importer' => [
         'name' => 'Toggl Data Importer',
-        'description' => 'Go to Admin -> Settings -> Data export. '.
-            'Under "Data Export" select all items for export and click on "Export to email". '.
-            'You will receive an email with a download link. Download the ZIP and upload it here. '.
-            'The "Data Export" exports everything except time entries. '.
+        'description' => '1. Go to Admin -> Settings -> Data export. <br>'.
+            '2. Under "Data Export" select all items for export and click on "Export to email". <br> '.
+            '3. You will receive an email with a download link. Download the ZIP and upload it here. '.
+            '<br><br>The "Data Export" exports everything except time entries. '.
             'If you want to also import time entries use the "Toggl Time Entries" importer afterwards.',
     ],
     'toggl_time_entries' => [
         'name' => 'Toggl Time Entries',
-        'description' => 'Important: If you want to import a Toggl organization use the "Toggl Data Importer" before using this importer, since this export contains more details. '.
-            'Go to Admin -> Settings -> Data export. Under "Time entries" select the year you want to export and click on "Export time entries". You can export all years one after another and import them one after another. '.
-            'Before you import make sure that the Timezone settings in Toggl are the same as in solidtime.',
+        'description' => '<strong>Important:</strong> If you want to import a Toggl organization use the "Toggl Data Importer" before using this importer, since this export contains more details. '.
+            '<br><br>1. Go to Admin -> Settings -> Data export. <br>2. Under "Time entries" select the year you want to export and click on "Export time entries". <br><br>You can export all years one after another and import them one after another. '.
+            ' <br>Before you import make sure that the Timezone settings in Toggl are the same as in solidtime.',
     ],
 ];
diff --git a/resources/js/Pages/Reporting.vue b/resources/js/Pages/Reporting.vue
@@ -119,7 +119,7 @@ function updateReporting() {
 function getOptimalGroupingOption(diff: number): 'day' | 'week' | 'month' {
     if (diff <= 31) {
         return 'day';
-    } else if (diff <= 365) {
+    } else if (diff <= 200) {
         return 'week';
     } else {
         return 'month';

diff --git a/resources/js/Pages/Teams/Partials/ImportData.vue b/resources/js/Pages/Teams/Partials/ImportData.vue
@@ -196,7 +196,9 @@ const showResultModal = ref(false);
                         <div class="font-semibold text-muted py-1">
                             Instructions:
                         </div>
-                        {{ currentImporterDescription }}
+                        <div
+                            class="max-w-2xl"
+                            v-html="currentImporterDescription"></div>
                     </div>
                 </div>