Merge branch 'develop' into 'main'

Develop

See merge request witelgroup/rms_v2!26

.gitignore

@@ -18,4 +18,4 @@ yarn-error.log
 /.fleet
 /.idea
 /.vscode
-archive.tgz
+archive.tgz

.gitlab-ci.yml

@@ -0,0 +1,91 @@
+default:
+  image: witel/rms:1.0
+
+
+stages:
+  - test
+  - lint
+  - deploy
+
+variables:
+  TAG_LATEST: $CI_REGISTRY_IMAGE/$CI_COMMIT_REF_NAME:latest
+  TAG_COMMIT: $CI_REGISTRY_IMAGE/$CI_COMMIT_REF_NAME:$CI_COMMIT_SHORT_SHA
+  TARGET_BRANCH_NAME: $CI_MERGE_REQUEST_TARGET_BRANCH_NAME
+  GIT_STRATEGY: fetch
+  GIT_DEPTH: 10
+  GIT_HTTP_LOW_SPEED_LIMIT: 1000  # Bytes per second
+  GIT_HTTP_LOW_SPEED_TIME: 30
+  MYSQL_ROOT_PASSWORD: $MYSQL_ROOT_PASSWORD
+
+# https://docs.gitlab.com/ee/ci/yaml/index.html#cache
+cache:
+  paths:
+    - vendor/
+
+services:
+  - name: mysql:latest
+    alias: mysql
+
+before_script:
+  - apk update
+  - coman=$(ls && pwd)
+  - echo "'$coman'"
+  - cp .env.example .env
+  - composer install
+  - php artisan key:generate
+  - apk add --no-cache ca-certificates
+  - update-ca-certificates
+  - git fetch
+
+
+test:
+  stage: test
+  script:
+    - php artisan config:clear
+    - cp .env.example .env.testing
+    - sed -i "s/DB_HOST=127.0.0.1/DB_HOST=mysql/" .env.testing
+    - sed -i "s/DB_DATABASE=/DB_DATABASE=$MYSQL_DATABASE/" .env.testing
+    - sed -i "s/DB_USERNAME=/DB_USERNAME=$MYSQL_USERNAME/" .env.testing
+    - sed -i "s/DB_PASSWORD=/DB_PASSWORD=$MYSQL_ROOT_PASSWORD/" .env.testing
+    - cat .env.testing
+    - php artisan key:generate --env=testing
+    - php artisan migrate --env=testing --force
+    - php artisan test
+  rules:
+    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
+      when: always
+
+.lint:
+  stage: lint
+  script:
+    - log=$(git log && git log -p)
+    - echo "'$log'"
+    - echo "'$CI_COMMIT_SHA'"
+    - CHANGED_FILES=$( git diff-tree --name-only -r origin/$TARGET_BRANCH_NAME -r $CI_COMMIT_SHA)
+    - echo $CHANGED_FILES
+    - composer require --dev squizlabs/php_codesniffer
+    - vendor/bin/phpcs --standard=PSR12 $CHANGED_FILES
+
+  rules:
+    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
+      when: always
+      allow_failure: true
+
+deploy:
+  stage: deploy
+  script:
+    - apt-get update && add --no-cache openssh-client
+    - chmod og-rwx $ID_RSA
+    - ssh -i $ID_RSA -o StrictHostKeyChecking=no $SERVER_USER@$SERVER_IP "
+      echo -e '$SHECAN_DNS' | sudo tee /etc/resolv.conf &&
+      dns=\$(cat /etc/resolv.conf) &&
+      echo \"\$dns\" &&
+      cd $PROJECT_PATH &&
+      git checkout $TARGET_BRANCH_NAME &&
+      ssh -T git@gitlab.com &&
+      git pull ssh-origin $TARGET_BRANCH_NAME &&
+      echo -e '$DEFAULT_DNS' | sudo tee /etc/resolv.conf"
+  resource_group: develop_deploy
+  rules:
+    - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_REF_NAME == "develop"'
+

README.md

@@ -1,2 +1,59 @@
-# RMTO Dashboard Project using Laravel
-git push sshorigin develop
+
+# RMS (road management system)
+
+
+## Dependencies
+<details>
+  <summary>Server</summary>
+  <ul>
+    <li><img src="https://skillicons.dev/icons?i=php" width="20" style="vertical-align: middle;"/> <a href="https://www.php.net/downloads">php8.1</a></li>
+    <li><img src="https://skillicons.dev/icons?i=laravel" width="20" style="vertical-align: middle;"/> <a href="https://www.php.net/downloads">Laravel10</a></li>
+  </ul>
+</details>
+
+<details>
+  <summary>Database</summary>
+  <ul>
+    <li><img src="https://skillicons.dev/icons?i=mysql" width="20" style="vertical-align: middle;"/> <a href="https://www.mysql.com">Mysql-15.1</a></li>
+    <li><img src="https://skillicons.dev/icons?i=mariadb" width="20" style="vertical-align: middle;"/> <a href="https://mariadb.org">MariaDB-10.11.8</a></li>
+  </ul>
+</details>
+
+
+<!-- GETTING STARTED -->
+## Prod Prerequisites
+apply bellow changes in order to set up the project on prod
+### Database configuration
+optimize MariaDB configuration through this path 
+ ```sh
+  /etc/mysql/mariadb.conf.d/50-server.cnf
+ ```
+ set this values
+ 
+ |        Variable                   |  Value   |                   Hardware Condition                               | MaraiDB version    |
+|:---------------------------------:|:--------:|:------------------------------------------------------------------:| :-----------------:|
+|innodb_buffer_pool_instances       | `8`      |                   no condition                                     | `>=10.11`          |
+|innodb_buffer_pool_size            | `8G`     |                   no condition                                     | `>=10.11`          |
+|innodb_file_per_table              | `ON`     |                   no condition                                     | `>=10.11`          |
+|innodb_log_file_size               | `768M`   |                   no condition                                     | `>=10.11`          | 
+|innodb_log_files_in_group          | `4`      |                   in case of a 4-core system                       | `>=10.11`          |
+|innodb_log_buffer_size             | `256M`   |                   no condition                                     | `>=10.11`          |
+|innodb_thread_concurrency          | `32`     |                   no condition                                     | `>=10.11`          |
+|innodb_stats_on_metadata           | `OFF`    |                   no condition                                     | `>=10.11`          |
+
+
+<img src="https://skillicons.dev/icons?i=nginx" width="40" style="vertical-align: middle;"/> <span style="font-size: 24px; font-weight: bold;">**ginx Configuration**</span>
+
+
+change Nginx configuration through this path in order to 
+avoid any timeout response
+ ```sh
+  /etc/nginx/sites_available/exmapl.com
+ ```
+|        Variable                   |  Value   |                   Condtion                                         | Context                 |         
+|:---------------------------------:|:--------:|:------------------------------------------------------------------:|:-----------------------:|
+|        proxy_connect_timeout      | `120`    |                   no condition                                     | `http, server, location`|
+|            proxy_send_timeout     | `120`    |                   no condition                                     | `http, server, location`|
+|        proxy_read_timeout         | `120`    |                   no condition                                     | `http, server, location`|
+|              send_timeout         | `120`    |                   no condition                                     | `http, server, location`| 
+|           fastcgi_read_timeout    | `300`    |                   no condition                                     | `location`              |

app/Console/Kernel.php

@@ -26,14 +26,14 @@ class Kernel extends ConsoleKernel
     protected function schedule(Schedule $schedule)
     {
         $schedule->command('webservice:roadobserved')
-                 ->everyFiveMinutes()->appendOutputTo(storage_path('logs/roadobser.log'));
+            ->everyFiveMinutes()->appendOutputTo(storage_path('logs/roadobser.log'));
 
         $schedule->command('command:sendcontractsmsnotification')
-                //  ->everyMinute()->appendOutputTo(storage_path('logs/contractSms.log'));
-                 ->dailyAt('10:00')->appendOutputTo(storage_path('logs/contractSms.log'));
+            //  ->everyMinute()->appendOutputTo(storage_path('logs/contractSms.log'));
+            ->dailyAt('10:00')->appendOutputTo(storage_path('logs/contractSms.log'));
 
         $schedule->command('reports:rms-summary')
-         ->dailyAt('00:00')->appendOutputTo(storage_path('logs/report_summary.log'));
+            ->dailyAt('00:00')->appendOutputTo(storage_path('logs/report_summary.log'));
 
 
     }
@@ -45,7 +45,7 @@ class Kernel extends ConsoleKernel
      */
     protected function commands()
     {
-        $this->load(__DIR__.'/Commands');
+        $this->load(__DIR__ . '/Commands');
 
         require base_path('routes/console.php');
     }

app/Exports/Activities/Two/Alaem/City.php

@@ -56,7 +56,7 @@ class City implements FromView, ShouldAutoSize, WithEvents, WithDrawings
         }
 
         $query .= " AND activity_date_time BETWEEN '{$fromDate}' AND '{$toDate}' GROUP BY city_id ORDER BY province_id ASC;";
-        $data = DB::select(DB::raw($query));
+        $data = DB::select($query);
 
         return view('excel.CurrentActivities.Alaem.City', [
             'data' => $data,

app/Exports/Activities/Two/Alaem/Province.php

@@ -56,7 +56,7 @@ class Province implements FromView, ShouldAutoSize, WithEvents, WithDrawings
 
         $query .= " AND activity_date_time BETWEEN '{$fromDate}' AND '{$toDate}' GROUP BY province_id ORDER BY province_id ASC;";
 
-        $data = DB::select(DB::raw($query));
+        $data = DB::select($query);
 
 
 
@@ -88,7 +88,7 @@ class Province implements FromView, ShouldAutoSize, WithEvents, WithDrawings
 
         $countryQuery .= " AND activity_date_time BETWEEN '{$fromDate}' AND '{$toDate}';";
 
-        $country = DB::select(DB::raw($countryQuery));
+        $country = DB::select($countryQuery);
 
         return view('excel.CurrentActivities.Alaem.Province', [
             'data' => $data,

app/Exports/Activities/Two/Bazrasi/City.php

@@ -51,7 +51,7 @@ class City implements FromView, ShouldAutoSize, WithEvents, WithDrawings
 
         $query .= " AND activity_date_time BETWEEN '{$fromDate}' AND '{$toDate}' GROUP BY city_id ORDER BY province_id ASC;";
 
-        $data = DB::select(DB::raw($query));
+        $data = DB::select($query);
 
 
         return view('excel.CurrentActivities.Bazrasi.City', [

app/Exports/Activities/Two/Bazrasi/Province.php

@@ -50,7 +50,7 @@ class Province implements FromView, ShouldAutoSize, WithEvents, WithDrawings
 
         $query .= " AND activity_date_time BETWEEN '{$fromDate}' AND '{$toDate}' GROUP BY province_id ORDER BY province_id ASC;";
 
-        $data = DB::select(DB::raw($query));
+        $data = DB::select($query);
 
         $countryQuery = "SELECT 
         COUNT(CASE WHEN sub_item = 1 THEN 1 END) as AbniyeFaniCount,
@@ -74,7 +74,7 @@ class Province implements FromView, ShouldAutoSize, WithEvents, WithDrawings
 
         $countryQuery .= " AND activity_date_time BETWEEN '{$fromDate}' AND '{$toDate}';";
 
-        $country = DB::select(DB::raw($countryQuery));
+        $country = DB::select($countryQuery);
 
         return view('excel.CurrentActivities.Bazrasi.Province', [
             'data' => $data,

app/Exports/Activities/Two/Ezterari/City.php

@@ -57,7 +57,7 @@ class City implements FromView, ShouldAutoSize, WithEvents, WithDrawings
 
         $query .= " AND activity_date_time BETWEEN '{$fromDate}' AND '{$toDate}' GROUP BY city_id ORDER BY province_id ASC;";
 
-        $data = DB::select(DB::raw($query));
+        $data = DB::select($query);
 
 
         return view('excel.CurrentActivities.Ezterari.City', [

app/Exports/Activities/Two/Ezterari/Province.php

@@ -56,7 +56,7 @@ class Province implements FromView, ShouldAutoSize, WithEvents, WithDrawings
 
         $query .= " AND activity_date_time BETWEEN '{$fromDate}' AND '{$toDate}' GROUP BY province_id ORDER BY province_id ASC;";
 
-        $data = DB::select(DB::raw($query));
+        $data = DB::select($query);
 
         $countryQuery = "SELECT 
         COUNT(CASE WHEN sub_item = 1 THEN 1 END) as PaksaziCount,
@@ -86,7 +86,7 @@ class Province implements FromView, ShouldAutoSize, WithEvents, WithDrawings
 
         $countryQuery .= " AND activity_date_time BETWEEN '{$fromDate}' AND '{$toDate}';";
 
-        $country = DB::select(DB::raw($countryQuery));
+        $country = DB::select($countryQuery);
 
         return view('excel.CurrentActivities.Ezterari.Province', [
             'data' => $data,

app/Exports/Activities/Two/Harim/City.php

@@ -51,7 +51,7 @@ class City implements FromView, ShouldAutoSize, WithEvents, WithDrawings
 
         $query .= " AND activity_date_time BETWEEN '{$fromDate}' AND '{$toDate}' GROUP BY city_id ORDER BY province_id ASC;";
 
-        $data = DB::select(DB::raw($query));
+        $data = DB::select($query);
 
         return view('excel.CurrentActivities.Harim.City', [
             'data' => $data,

app/Exports/Activities/Two/Harim/Province.php

@@ -49,7 +49,7 @@ class Province implements FromView, ShouldAutoSize, WithEvents, WithDrawings
         }
 
         $query .= " AND activity_date_time BETWEEN '{$fromDate}' AND '{$toDate}' GROUP BY province_id ORDER BY province_id ASC;";
-        $data = DB::select(DB::raw($query));
+        $data = DB::select($query);
 
 
         $countryQuery = "SELECT 
@@ -66,7 +66,7 @@ class Province implements FromView, ShouldAutoSize, WithEvents, WithDrawings
         COUNT(CASE WHEN sub_item = 6 THEN 1 END) as JamavariBannerCount,
         SUM(CASE WHEN sub_item = 6 THEN sub_item_data END) as JamavariBannerSum
         FROM road_items_projects
-        WHERE item = 10 ans status = 1";
+        WHERE item = 10 and status = 1";
 
         if ($this->province) {
             $countryQuery .= " AND province_id = {$this->province}";
@@ -74,7 +74,7 @@ class Province implements FromView, ShouldAutoSize, WithEvents, WithDrawings
 
         $countryQuery .= " AND activity_date_time BETWEEN '{$fromDate}' AND '{$toDate}';";
 
-        $country = DB::select(DB::raw($countryQuery));
+        $country = DB::select($countryQuery);
 
 
         return view('excel.CurrentActivities.Harim.Province', [

app/Exports/Activities/Two/Hefaz/City.php

@@ -45,7 +45,7 @@ class City implements FromView, ShouldAutoSize, WithEvents, WithDrawings
 
         $query .= " AND activity_date_time BETWEEN '{$fromDate}' AND '{$toDate}' GROUP BY city_id ORDER BY province_id ASC;";
 
-        $data = DB::select(DB::raw($query));
+        $data = DB::select($query);
 
         return view('excel.CurrentActivities.Hefaz.City', [
             'data' => $data,

app/Exports/Activities/Two/Hefaz/Province.php

@@ -36,7 +36,7 @@ class Province implements FromView, ShouldAutoSize, WithEvents, WithDrawings
         province_id,
         province_fa
         FROM road_items_projects
-        WHERE item = 4 ans status = 1 ";
+        WHERE item = 4 and status = 1 ";
 
         if ($this->province) {
             $query .= " AND province_id = {$this->province}";
@@ -44,7 +44,7 @@ class Province implements FromView, ShouldAutoSize, WithEvents, WithDrawings
 
         $query .= " AND activity_date_time BETWEEN '{$fromDate}' AND '{$toDate}' GROUP BY province_id ORDER BY province_id ASC;";
         
-        $data = DB::select(DB::raw($query));
+        $data = DB::select($query);
 
 
 
@@ -64,7 +64,7 @@ class Province implements FromView, ShouldAutoSize, WithEvents, WithDrawings
 
         $countryQuery .= " AND activity_date_time BETWEEN '{$fromDate}' AND '{$toDate}';";
 
-        $country = DB::select(DB::raw($countryQuery));
+        $country = DB::select($countryQuery);
 
         return view('excel.CurrentActivities.Hefaz.Province', [
             'data' => $data,

app/Exports/Activities/Two/Imensazi/City.php

@@ -63,7 +63,7 @@ class City implements FromView, ShouldAutoSize, WithEvents, WithDrawings
 
         $query .= " AND activity_date_time BETWEEN '{$fromDate}' AND '{$toDate}' GROUP BY city_id ORDER BY province_id ASC;";
 
-        $data = DB::select(DB::raw($query));
+        $data = DB::select($query);
 
         return view('excel.CurrentActivities.Imensazi.City', [
             'data' => $data,

app/Exports/Activities/Two/Imensazi/Province.php

@@ -62,7 +62,7 @@ class Province implements FromView, ShouldAutoSize, WithEvents, WithDrawings
 
         $query .= " AND activity_date_time BETWEEN '{$fromDate}' AND '{$toDate}' GROUP BY province_id ORDER BY province_id ASC;";
 
-        $data = DB::select(DB::raw($query));
+        $data = DB::select($query);
 
         $countryQuery = "SELECT 
         COUNT(CASE WHEN sub_item = 1 THEN 1 END) as ImensaziSarguardCount,
@@ -98,7 +98,7 @@ class Province implements FromView, ShouldAutoSize, WithEvents, WithDrawings
 
         $countryQuery .= " AND activity_date_time BETWEEN '{$fromDate}' AND '{$toDate}';";
 
-        $country = DB::select(DB::raw($countryQuery));
+        $country = DB::select($countryQuery);
 
         return view('excel.CurrentActivities.Imensazi.Province', [
             'data' => $data,

app/Exports/Activities/Two/Khatkeshi/City.php

@@ -50,7 +50,7 @@ class City implements FromView, ShouldAutoSize, WithEvents, WithDrawings
         }
 
         $query .= " AND activity_date_time BETWEEN '{$fromDate}' AND '{$toDate}' GROUP BY city_id ORDER BY province_id ASC;";
-        $data = DB::select(DB::raw($query));
+        $data = DB::select($query);
 
         return view('excel.CurrentActivities.Khatkeshi.City', [
             'data' => $data,

app/Exports/Activities/Two/Khatkeshi/Province.php

@@ -50,7 +50,7 @@ class Province implements FromView, ShouldAutoSize, WithEvents, WithDrawings
 
         $query .= " AND activity_date_time BETWEEN '{$fromDate}' AND '{$toDate}' GROUP BY province_id ORDER BY province_id ASC;";
 
-        $data = DB::select(DB::raw($query));
+        $data = DB::select($query);
 
         $countryQuery = "SELECT 
         COUNT(CASE WHEN sub_item = 1 THEN 1 END) as KhatkeshiRangGarmCount,
@@ -74,7 +74,7 @@ class Province implements FromView, ShouldAutoSize, WithEvents, WithDrawings
 
         $countryQuery .= " AND activity_date_time BETWEEN '{$fromDate}' AND '{$toDate}';";
 
-        $country = DB::select(DB::raw($countryQuery));
+        $country = DB::select($countryQuery);
 
         return view('excel.CurrentActivities.Khatkeshi.Province', [
             'data' => $data,

app/Exports/Activities/Two/Mashinalat/City.php

@@ -60,7 +60,7 @@ class City implements FromView, ShouldAutoSize, WithEvents, WithDrawings
         }
 
         $query .= " AND activity_date_time BETWEEN '{$fromDate}' AND '{$toDate}' GROUP BY city_id ORDER BY province_id ASC;";
-        $data = DB::select(DB::raw($query));
+        $data = DB::select($query);
 
         return view('excel.CurrentActivities.Mashinalat.City', [
             'data' => $data,

app/Exports/Activities/Two/Mashinalat/Province.php

@@ -60,7 +60,7 @@ class Province implements FromView, ShouldAutoSize, WithEvents, WithDrawings
 
         $query .= " AND activity_date_time BETWEEN '{$fromDate}' AND '{$toDate}' GROUP BY province_id ORDER BY province_id ASC;";
         
-        $data = DB::select(DB::raw($query));
+        $data = DB::select($query);
 
         $countryQuery = "SELECT 
         COUNT(CASE WHEN sub_item = 1 THEN 1 END) as BenzinMasrafiCount,
@@ -86,7 +86,7 @@ class Province implements FromView, ShouldAutoSize, WithEvents, WithDrawings
 
         $countryQuery .= " AND activity_date_time BETWEEN '{$fromDate}' AND '{$toDate}';";
 
-        $country = DB::select(DB::raw($countryQuery));
+        $country = DB::select($countryQuery);
 
         return view('excel.CurrentActivities.Mashinalat.Province', [
             'data' => $data,

app/Exports/Activities/Two/Paksazi/City.php

@@ -76,7 +76,7 @@ class City implements FromView, ShouldAutoSize, WithEvents, WithDrawings
         }
 
         $query .= " AND activity_date_time BETWEEN '{$fromDate}' AND '{$toDate}' GROUP BY city_id ORDER BY province_id ASC;";
-        $data = DB::select(DB::raw($query));
+        $data = DB::select($query);
 
         return view('excel.CurrentActivities.Paksazi.City', [
             'data' => $data,

app/Exports/Activities/Two/Paksazi/Province.php

@@ -76,7 +76,7 @@ class Province implements FromView, ShouldAutoSize, WithEvents, WithDrawings
 
         $query .= " AND activity_date_time BETWEEN '{$fromDate}' AND '{$toDate}' GROUP BY province_id ORDER BY province_id ASC;";
 
-        $data = DB::select(DB::raw($query));
+        $data = DB::select($query);
 
         $countryQuery = "SELECT 
         COUNT(CASE WHEN sub_item = 1 THEN 1 END) as PaksaziSathRahCount,
@@ -126,7 +126,7 @@ class Province implements FromView, ShouldAutoSize, WithEvents, WithDrawings
 
         $countryQuery .= " AND activity_date_time BETWEEN '{$fromDate}' AND '{$toDate}';";
 
-        $country = DB::select(DB::raw($countryQuery));
+        $country = DB::select($countryQuery);
 
         return view('excel.CurrentActivities.Paksazi.Province', [
             'data' => $data,

app/Exports/Activities/Two/Pol/City.php

@@ -59,7 +59,7 @@ class City implements FromView, ShouldAutoSize, WithEvents, WithDrawings
         }
 
         $query .= " AND activity_date_time BETWEEN '{$fromDate}' AND '{$toDate}' GROUP BY city_id ORDER BY province_id ASC;";
-        $data = DB::select(DB::raw($query));
+        $data = DB::select($query);
 
         return view('excel.CurrentActivities.Pol.City', [
             'data' => $data,

app/Exports/Activities/Two/Pol/Province.php

@@ -58,7 +58,7 @@ class Province implements FromView, ShouldAutoSize, WithEvents, WithDrawings
 
         $query .= " AND activity_date_time BETWEEN '{$fromDate}' AND '{$toDate}' GROUP BY province_id ORDER BY province_id ASC;";
 
-        $data = DB::select(DB::raw($query));
+        $data = DB::select($query);
 
         $countryQuery = "SELECT 
         COUNT(CASE WHEN sub_item = 1 THEN 1 END) as EhdasGharnizPolCount,
@@ -90,7 +90,7 @@ class Province implements FromView, ShouldAutoSize, WithEvents, WithDrawings
 
         $countryQuery .= " AND activity_date_time BETWEEN '{$fromDate}' AND '{$toDate}';";
 
-        $country = DB::select(DB::raw($countryQuery));
+        $country = DB::select($countryQuery);
 
 
         return view('excel.CurrentActivities.Pol.Province', [

app/Exports/Activities/Two/Rahdar/City.php

@@ -45,7 +45,7 @@ class City implements FromView, ShouldAutoSize, WithEvents, WithDrawings
         }
 
         $query .= " AND activity_date_time BETWEEN '{$fromDate}' AND '{$toDate}' GROUP BY city_id ORDER BY province_id ASC;";
-        $data = DB::select(DB::raw($query));
+        $data = DB::select($query);
 
         return view('excel.CurrentActivities.Rahdar.City', [
             'data' => $data,

app/Exports/Activities/Two/Rahdar/Province.php

@@ -42,7 +42,7 @@ class Province implements FromView, ShouldAutoSize, WithEvents, WithDrawings
 
         $query .= " AND activity_date_time BETWEEN '{$fromDate}' AND '{$toDate}' GROUP BY province_id ORDER BY province_id ASC;";
 
-        $data = DB::select(DB::raw($query));
+        $data = DB::select($query);
 
         $countryQuery = "SELECT 
         COUNT(CASE WHEN sub_item = 1 THEN 1 END) as TamiratCount,
@@ -58,7 +58,7 @@ class Province implements FromView, ShouldAutoSize, WithEvents, WithDrawings
 
         $countryQuery .= " AND activity_date_time BETWEEN '{$fromDate}' AND '{$toDate}';";
 
-        $country = DB::select(DB::raw($countryQuery));
+        $country = DB::select($countryQuery);
 
         return view('excel.CurrentActivities.Rahdar.Province', [
             'data' => $data,

app/Exports/Activities/Two/Rangamizi/City.php

@@ -57,7 +57,7 @@ class City implements FromView, ShouldAutoSize, WithEvents, WithDrawings
 
         $query .= " AND activity_date_time BETWEEN '{$fromDate}' AND '{$toDate}' GROUP BY city_id ORDER BY province_id ASC;";
 
-        $data = DB::select(DB::raw($query));
+        $data = DB::select($query);
 
 
         return view('excel.CurrentActivities.Rangamizi.City', [

app/Exports/Activities/Two/Rangamizi/Province.php

@@ -55,7 +55,7 @@ class Province implements FromView, ShouldAutoSize, WithEvents, WithDrawings
         }
 
         $query .= " AND activity_date_time BETWEEN '{$fromDate}' AND '{$toDate}' GROUP BY province_id ORDER BY province_id ASC;";
-        $data = DB::select(DB::raw($query));
+        $data = DB::select($query);
 
         $countryQuery = "SELECT 
         COUNT(CASE WHEN sub_item = 1 THEN 1 END) as RangamiziTabloCount,
@@ -85,7 +85,7 @@ class Province implements FromView, ShouldAutoSize, WithEvents, WithDrawings
 
         $countryQuery .= " AND activity_date_time BETWEEN '{$fromDate}' AND '{$toDate}';";
 
-        $country = DB::select(DB::raw($countryQuery));
+        $country = DB::select($countryQuery);
 
 
         return view('excel.CurrentActivities.Rangamizi.Province', [

app/Exports/Activities/Two/Roshanaei/City.php

@@ -61,7 +61,7 @@ class City implements FromView, ShouldAutoSize, WithEvents, WithDrawings
 
         $query .= " AND activity_date_time BETWEEN '{$fromDate}' AND '{$toDate}' GROUP BY city_id ORDER BY province_id ASC;";
 
-        $data = DB::select(DB::raw($query));
+        $data = DB::select($query);
 
         return view('excel.CurrentActivities.Roshanaei.City', [
             'data' => $data,

app/Exports/Activities/Two/Roshanaei/Province.php

@@ -60,7 +60,7 @@ class Province implements FromView, ShouldAutoSize, WithEvents, WithDrawings
 
         $query .= " AND activity_date_time BETWEEN '{$fromDate}' AND '{$toDate}' GROUP BY province_id ORDER BY province_id ASC;";
 
-        $data = DB::select(DB::raw($query));
+        $data = DB::select($query);
 
         $countryQuery = "SELECT 
         COUNT(CASE WHEN sub_item = 1 THEN 1 END) as NegahdariToolCount,
@@ -94,7 +94,7 @@ class Province implements FromView, ShouldAutoSize, WithEvents, WithDrawings
 
         $countryQuery .= " AND activity_date_time BETWEEN '{$fromDate}' AND '{$toDate}';";
 
-        $country = DB::select(DB::raw($countryQuery));
+        $country = DB::select($countryQuery);
 
 
         return view('excel.CurrentActivities.Roshanaei.Province', [

app/Exports/Activities/Two/Shosteshoo/City.php

@@ -52,7 +52,7 @@ class City implements FromView, ShouldAutoSize, WithEvents, WithDrawings
         }
 
         $query .= " AND activity_date_time BETWEEN '{$fromDate}' AND '{$toDate}' GROUP BY city_id ORDER BY province_id ASC;";
-        $data = DB::select(DB::raw($query));
+        $data = DB::select($query);
 
         return view('excel.CurrentActivities.Shosteshoo.City', [
             'data' => $data,

app/Exports/Activities/Two/Shosteshoo/Province.php

@@ -51,7 +51,7 @@ class Province implements FromView, ShouldAutoSize, WithEvents, WithDrawings
         }
 
         $query .= " AND activity_date_time BETWEEN '{$fromDate}' AND '{$toDate}' GROUP BY province_id ORDER BY province_id ASC;";
-        $data = DB::select(DB::raw($query));
+        $data = DB::select($query);
 
 
         $countryQuery = "SELECT 
@@ -78,7 +78,7 @@ class Province implements FromView, ShouldAutoSize, WithEvents, WithDrawings
 
         $countryQuery .= " AND activity_date_time BETWEEN '{$fromDate}' AND '{$toDate}';";
 
-        $country = DB::select(DB::raw($countryQuery));
+        $country = DB::select($countryQuery);
 
         return view('excel.CurrentActivities.Shosteshoo.Province', [
             'data' => $data,

app/Exports/Activities/Two/Toonel/City.php

@@ -59,7 +59,7 @@ class City implements FromView, ShouldAutoSize, WithEvents, WithDrawings
 
         $query .= " AND activity_date_time BETWEEN '{$fromDate}' AND '{$toDate}' GROUP BY city_id ORDER BY province_id ASC;";
         
-        $data = DB::select(DB::raw($query));
+        $data = DB::select($query);
 
         return view('excel.CurrentActivities.Toonel.City', [
             'data' => $data,

app/Exports/Activities/Two/Toonel/Province.php

@@ -57,7 +57,7 @@ class Province implements FromView, ShouldAutoSize, WithEvents, WithDrawings
         }
 
         $query .= " AND activity_date_time BETWEEN '{$fromDate}' AND '{$toDate}' GROUP BY province_id ORDER BY province_id ASC;";
-        $data = DB::select(DB::raw($query));
+        $data = DB::select($query);
 
 
 
@@ -91,7 +91,7 @@ class Province implements FromView, ShouldAutoSize, WithEvents, WithDrawings
 
         $countryQuery .= " AND activity_date_time BETWEEN '{$fromDate}' AND '{$toDate}';";
 
-        $country = DB::select(DB::raw($countryQuery));
+        $country = DB::select($countryQuery);
 
 
         return view('excel.CurrentActivities.Toonel.Province', [

app/Exports/Activities/Two/Zemestani/City.php

@@ -50,7 +50,7 @@ class City implements FromView, ShouldAutoSize, WithEvents, WithDrawings
 
         $query .= " AND activity_date_time BETWEEN '{$fromDate}' AND '{$toDate}' GROUP BY city_id ORDER BY province_id ASC;";
         
-        $data = DB::select(DB::raw($query));
+        $data = DB::select($query);
 
         return view('excel.CurrentActivities.Zemestani.City', [
             'data' => $data,

app/Exports/Activities/Two/Zemestani/Province.php

@@ -47,7 +47,7 @@ class Province implements FromView, ShouldAutoSize, WithEvents, WithDrawings
         }
 
         $query .= " AND activity_date_time BETWEEN '{$fromDate}' AND '{$toDate}' GROUP BY province_id ORDER BY province_id ASC;";
-        $data = DB::select(DB::raw($query));
+        $data = DB::select($query);
 
 
 
@@ -71,7 +71,7 @@ class Province implements FromView, ShouldAutoSize, WithEvents, WithDrawings
 
         $countryQuery .= " AND activity_date_time BETWEEN '{$fromDate}' AND '{$toDate}';";
 
-        $country = DB::select(DB::raw($countryQuery));
+        $country = DB::select($countryQuery);
 
 
         return view('excel.CurrentActivities.Zemestani.Province', [

app/Exports/V2/RoadObservation/OperatorCartableExport.php

@@ -25,34 +25,34 @@ class OperatorCartableExport implements FromView, ShouldAutoSize, WithEvents, Wi
         $this->fromDate = $fromDate;
         $this->toDate = $toDate;
     }
-    
+
     public function view(): View
     {
-        $fromDate = $this->fromDate ? $this->fromDate . ' 00:00:00': null;
-        $toDate = $this->toDate ?  $this->toDate . ' 23:59:59': null;
+        $fromDate = $this->fromDate ? $this->fromDate . ' 00:00:00' : null;
+        $toDate = $this->toDate ? $this->toDate . ' 23:59:59' : null;
 
         $status = $this->status;
 
         if (auth()->user()->hasPermissionTo('show-fast-react')) {
             $data = RoadObserved::leftjoin('edarate_shahri', 'road_observeds.edarate_shahri_id', 'edarate_shahri.id')
-                                ->where('rms_status', '!=', 0)
-                                ->whereNotNull('road_observeds.province_id')
-                                ->whereNotNull('status')
-                                ->when($this->id, function($query, $id){
-                                    return $query->where('road_observeds.id', 'LIKE', '%'. $id. '%');
-                                })
-                                ->when(!is_null($status), function($query) use ($status){
-                                    return $query->where('status', $status);
-                                })
-                                ->when(($fromDate && $toDate), function($query) use($fromDate, $toDate){
-                                    return $query->whereBetween('rms_last_activity', [$fromDate, $toDate]);
-                                })                                
-                                ->selectRaw('AutoID, road_observeds.id, Title, FeatureTypeTitle, MobileForSendEventSms,
+                ->where('rms_status', '!=', 0)
+                ->whereNotNull('road_observeds.province_id')
+                ->whereNotNull('status')
+                ->when($this->id, function ($query, $id) {
+                    return $query->where('road_observeds.id', 'LIKE', '%' . $id . '%');
+                })
+                ->when(!is_null($status), function ($query) use ($status) {
+                    return $query->where('status', $status);
+                })
+                ->when(($fromDate && $toDate), function ($query) use ($fromDate, $toDate) {
+                    return $query->whereBetween('rms_last_activity', [$fromDate, $toDate]);
+                })
+                ->selectRaw('fk_RegisteredEventMessage, road_observeds.id, Title, FeatureTypeTitle, MobileForSendEventSms,
                                              road_observeds.created_at, rms_last_activity, rms_last_activity_fa, status, status_fa, supervisor_description, rms_description, province_fa, city_fa, edarate_shahri.name_fa as edarate_shahri_name_fa')
-                                ->orderBy('status')
-                                ->orderBy('road_observeds.id', 'desc')
-                                ->get();
-                                
+                ->orderBy('status')
+                ->orderBy('road_observeds.id', 'desc')
+                ->get();
+
         } elseif (auth()->user()->hasPermissionTo('show-fast-react-province')) {
             if (is_null(auth()->user()->province_id)) {
                 return response()->json([
@@ -61,25 +61,25 @@ class OperatorCartableExport implements FromView, ShouldAutoSize, WithEvents, Wi
             }
 
             $data = RoadObserved::leftjoin('edarate_shahri', 'road_observeds.edarate_shahri_id', 'edarate_shahri.id')
-                                ->where('rms_province_id', auth()->user()->province_id)
-                                ->where('rms_status', '!=', 0)
-                                ->whereNotNull('road_observeds.province_id')
-                                ->whereNotNull('status')
-                                ->when($this->id, function($query, $id){
-                                    return $query->where('road_observeds.id', 'LIKE', '%'. $id. '%');
-                                })
-                                ->when(!is_null($status), function($query) use ($status){
-                                    return $query->where('status', $status);
-                                })
-                                ->when(($fromDate && $toDate), function($query) use($fromDate, $toDate){
-                                    return $query->whereBetween('rms_last_activity', [$fromDate, $toDate]);
-                                })
-                                ->selectRaw('AutoID, road_observeds.id, Title, FeatureTypeTitle, MobileForSendEventSms,
+                ->where('rms_province_id', auth()->user()->province_id)
+                ->where('rms_status', '!=', 0)
+                ->whereNotNull('road_observeds.province_id')
+                ->whereNotNull('status')
+                ->when($this->id, function ($query, $id) {
+                    return $query->where('road_observeds.id', 'LIKE', '%' . $id . '%');
+                })
+                ->when(!is_null($status), function ($query) use ($status) {
+                    return $query->where('status', $status);
+                })
+                ->when(($fromDate && $toDate), function ($query) use ($fromDate, $toDate) {
+                    return $query->whereBetween('rms_last_activity', [$fromDate, $toDate]);
+                })
+                ->selectRaw('fk_RegisteredEventMessage, road_observeds.id, Title, FeatureTypeTitle, MobileForSendEventSms,
                                              road_observeds.created_at, rms_last_activity, rms_last_activity_fa, status, status_fa, supervisor_description, rms_description, province_fa, city_fa, edarate_shahri.name_fa as edarate_shahri_name_fa')
-                                ->orderBy('status')
-                                ->orderBy('road_observeds.id', 'desc')
-                                ->get();
-                                
+                ->orderBy('status')
+                ->orderBy('road_observeds.id', 'desc')
+                ->get();
+
         } elseif (auth()->user()->hasPermissionTo('show-fast-react-edarate-shahri')) {
             if (is_null(auth()->user()->edarate_shahri_id)) {
                 return response()->json([
@@ -88,25 +88,25 @@ class OperatorCartableExport implements FromView, ShouldAutoSize, WithEvents, Wi
             }
 
             $data = RoadObserved::leftjoin('edarate_shahri', 'road_observeds.edarate_shahri_id', 'edarate_shahri.id')
-                                ->where('edarate_shahri_id', auth()->user()->edarate_shahri_id)
-                                ->where('rms_status', '!=', 0)
-                                ->whereNotNull('road_observeds.province_id')
-                                ->whereNotNull('status')
-                                ->when($this->id, function($query, $id){
-                                    return $query->where('road_observeds.id', 'LIKE', '%'. $id. '%');
-                                })
-                                ->when(!is_null($status), function($query) use ($status){
-                                    return $query->where('status', $status);
-                                })
-                                ->when(($fromDate && $toDate), function($query) use($fromDate, $toDate){
-                                    return $query->whereBetween('rms_last_activity', [$fromDate, $toDate]);
-                                })
-                                ->selectRaw('AutoID, road_observeds.id, Title, FeatureTypeTitle, MobileForSendEventSms,
+                ->where('edarate_shahri_id', auth()->user()->edarate_shahri_id)
+                ->where('rms_status', '!=', 0)
+                ->whereNotNull('road_observeds.province_id')
+                ->whereNotNull('status')
+                ->when($this->id, function ($query, $id) {
+                    return $query->where('road_observeds.id', 'LIKE', '%' . $id . '%');
+                })
+                ->when(!is_null($status), function ($query) use ($status) {
+                    return $query->where('status', $status);
+                })
+                ->when(($fromDate && $toDate), function ($query) use ($fromDate, $toDate) {
+                    return $query->whereBetween('rms_last_activity', [$fromDate, $toDate]);
+                })
+                ->selectRaw('fk_RegisteredEventMessage, road_observeds.id, Title, FeatureTypeTitle, MobileForSendEventSms,
                                              road_observeds.created_at, rms_last_activity, rms_last_activity_fa, status, status_fa, supervisor_description, rms_description, province_fa, city_fa, edarate_shahri.name_fa as edarate_shahri_name_fa')
-                                ->orderBy('status')
-                                ->orderBy('road_observeds.id', 'desc')
-                                ->get();
-                                
+                ->orderBy('status')
+                ->orderBy('road_observeds.id', 'desc')
+                ->get();
+
         }
 
         return view('excel.V2.RoadObservation.operator_cartable', [
@@ -118,11 +118,11 @@ class OperatorCartableExport implements FromView, ShouldAutoSize, WithEvents, Wi
 
     /**
      * @return array
-    */
+     */
     public function registerEvents(): array
     {
         return [
-            AfterSheet::class => function(AfterSheet $event) {
+            AfterSheet::class => function (AfterSheet $event) {
                 $event->sheet->getDelegate()->setRightToLeft(true);
             },
         ];
@@ -139,7 +139,7 @@ class OperatorCartableExport implements FromView, ShouldAutoSize, WithEvents, Wi
         $drawing->setOffsetX(5);
         $drawing->setOffsetY(5);
         $drawing->setCoordinates('A1');
-        
+
         $drawing2 = new Drawing();
         $drawing2->setName('Logo');
         $drawing2->setDescription('This is my logo');
@@ -157,7 +157,7 @@ class OperatorCartableExport implements FromView, ShouldAutoSize, WithEvents, Wi
 
         return [
             // Style the first row as bold text.
-            'A:BA' =>    [
+            'A:BA' => [
                 'font' => [
                     'name' => 'B Nazanin'
                 ]

app/Exports/V2/RoadObservation/PendingComplaintsExport.php

@@ -24,28 +24,28 @@ class PendingComplaintsExport implements FromView, ShouldAutoSize, WithEvents, W
         $this->fromDate = $fromDate;
         $this->toDate = $toDate;
     }
-    
+
     public function view(): View
     {
-        $fromDate = $this->fromDate ? $this->fromDate . ' 00:00:00': null;
-        $toDate = $this->toDate ?  $this->toDate . ' 23:59:59': null;
+        $fromDate = $this->fromDate ? $this->fromDate . ' 00:00:00' : null;
+        $toDate = $this->toDate ? $this->toDate . ' 23:59:59' : null;
 
         if (auth()->user()->hasPermissionTo('show-fast-react')) {
             $data = RoadObserved::leftjoin('edarate_shahri', 'road_observeds.edarate_shahri_id', 'edarate_shahri.id')
-                                ->where('rms_status', 0)
-                                ->whereNotNull('edarate_shahri_id')
-                                ->when($this->province_id, function($query, $province_id){
-                                    return $query->where('road_observeds.province_id', $province_id);
-                                })
-                                ->when(($fromDate && $toDate), function($query) use($fromDate, $toDate){
-                                    return $query->whereBetween('road_observeds.created_at', [$fromDate, $toDate]);
-                                })                                
-                                ->selectRaw('AutoID, road_observeds.id, Title, FeatureTypeTitle, MobileForSendEventSms,
+                ->where('rms_status', 0)
+                ->whereNotNull('edarate_shahri_id')
+                ->when($this->province_id, function ($query, $province_id) {
+                    return $query->where('road_observeds.province_id', $province_id);
+                })
+                ->when(($fromDate && $toDate), function ($query) use ($fromDate, $toDate) {
+                    return $query->whereBetween('road_observeds.created_at', [$fromDate, $toDate]);
+                })
+                ->selectRaw('fk_RegisteredEventMessage, road_observeds.id, Title, FeatureTypeTitle, MobileForSendEventSms,
                                              road_observeds.created_at, rms_last_activity, rms_last_activity_fa, status, 
                                              status_fa, supervisor_description, rms_description, province_fa, city_fa, Description, edarate_shahri.name_fa as edarate_shahri_name_fa, lat, lng')
-                                ->orderBy('status')
-                                ->orderBy('road_observeds.id', 'desc')
-                                ->get();
+                ->orderBy('status')
+                ->orderBy('road_observeds.id', 'desc')
+                ->get();
 
 
         } elseif (auth()->user()->hasPermissionTo('show-fast-react-province')) {
@@ -56,18 +56,18 @@ class PendingComplaintsExport implements FromView, ShouldAutoSize, WithEvents, W
             }
 
             $data = RoadObserved::leftjoin('edarate_shahri', 'road_observeds.edarate_shahri_id', 'edarate_shahri.id')
-                                ->where('rms_province_id', auth()->user()->province_id)
-                                ->where('rms_status', 0)
-                                ->whereNotNull('road_observeds.province_id')
-                                ->when(($fromDate && $toDate), function($query) use($fromDate, $toDate){
-                                    return $query->whereBetween('road_observeds.created_at', [$fromDate, $toDate]);
-                                })
-                                ->selectRaw('AutoID, road_observeds.id, Title, FeatureTypeTitle, MobileForSendEventSms,
+                ->where('rms_province_id', auth()->user()->province_id)
+                ->where('rms_status', 0)
+                ->whereNotNull('road_observeds.province_id')
+                ->when(($fromDate && $toDate), function ($query) use ($fromDate, $toDate) {
+                    return $query->whereBetween('road_observeds.created_at', [$fromDate, $toDate]);
+                })
+                ->selectRaw('fk_RegisteredEventMessage, road_observeds.id, Title, FeatureTypeTitle, MobileForSendEventSms,
                                              road_observeds.created_at, rms_last_activity, rms_last_activity_fa, status, 
                                              status_fa, supervisor_description, rms_description, province_fa, city_fa, Description, edarate_shahri.name_fa as edarate_shahri_name_fa, lat, lng')
-                                ->orderBy('status')
-                                ->orderBy('road_observeds.id', 'desc')
-                                ->get();                                 
+                ->orderBy('status')
+                ->orderBy('road_observeds.id', 'desc')
+                ->get();
 
         } elseif (auth()->user()->hasPermissionTo('show-fast-react-edarate-shahri')) {
             if (is_null(auth()->user()->edarate_shahri_id)) {
@@ -77,20 +77,20 @@ class PendingComplaintsExport implements FromView, ShouldAutoSize, WithEvents, W
             }
 
             $data = RoadObserved::leftjoin('edarate_shahri', 'road_observeds.edarate_shahri_id', 'edarate_shahri.id')
-                                ->where('edarate_shahri_id', auth()->user()->edarate_shahri_id)
-                                ->where('rms_status', 0)
-                                ->whereNotNull('edarate_shahri_id')
-                                ->when(($fromDate && $toDate), function($query) use($fromDate, $toDate){
-                                    return $query->whereBetween('road_observeds.created_at', [$fromDate, $toDate]);
-                                })
-                                ->selectRaw('AutoID, road_observeds.id, Title, FeatureTypeTitle, MobileForSendEventSms,
+                ->where('edarate_shahri_id', auth()->user()->edarate_shahri_id)
+                ->where('rms_status', 0)
+                ->whereNotNull('edarate_shahri_id')
+                ->when(($fromDate && $toDate), function ($query) use ($fromDate, $toDate) {
+                    return $query->whereBetween('road_observeds.created_at', [$fromDate, $toDate]);
+                })
+                ->selectRaw('fk_RegisteredEventMessage, road_observeds.id, Title, FeatureTypeTitle, MobileForSendEventSms,
                                              road_observeds.created_at, rms_last_activity, rms_last_activity_fa, status, 
                                              status_fa, supervisor_description, rms_description, province_fa, city_fa, Description, edarate_shahri.name_fa as edarate_shahri_name_fa, lat, lng')
-                                ->orderBy('status')
-                                ->orderBy('road_observeds.id', 'desc')
-                                ->get();            
-                                                        
-            
+                ->orderBy('status')
+                ->orderBy('road_observeds.id', 'desc')
+                ->get();
+
+
         }
 
         return view('excel.V2.RoadObservation.pending_complaints', [
@@ -102,11 +102,11 @@ class PendingComplaintsExport implements FromView, ShouldAutoSize, WithEvents, W
 
     /**
      * @return array
-    */
+     */
     public function registerEvents(): array
     {
         return [
-            AfterSheet::class => function(AfterSheet $event) {
+            AfterSheet::class => function (AfterSheet $event) {
                 $event->sheet->getDelegate()->setRightToLeft(true);
             },
         ];
@@ -123,7 +123,7 @@ class PendingComplaintsExport implements FromView, ShouldAutoSize, WithEvents, W
         $drawing->setOffsetX(5);
         $drawing->setOffsetY(5);
         $drawing->setCoordinates('A1');
-        
+
         $drawing2 = new Drawing();
         $drawing2->setName('Logo');
         $drawing2->setDescription('This is my logo');
@@ -141,7 +141,7 @@ class PendingComplaintsExport implements FromView, ShouldAutoSize, WithEvents, W
 
         return [
             // Style the first row as bold text.
-            'A:BA' =>    [
+            'A:BA' => [
                 'font' => [
                     'name' => 'B Nazanin'
                 ]

app/Exports/V2/RoadObservation/ReportComplaintsExport.php

@@ -29,34 +29,34 @@ class ReportComplaintsExport implements FromView, ShouldAutoSize, WithEvents, Wi
     {
         return [
             'E' => 60,
-            'G' => 60,            
-            'K' => 60,            
+            'G' => 60,
+            'K' => 60,
         ];
     }
-    
+
     public function view(): View
     {
-        $fromDate = $this->fromDate ? $this->fromDate . ' 00:00:00': null;
-        $toDate = $this->toDate ?  $this->toDate . ' 23:59:59': null;
+        $fromDate = $this->fromDate ? $this->fromDate . ' 00:00:00' : null;
+        $toDate = $this->toDate ? $this->toDate . ' 23:59:59' : null;
 
         $data = [];
 
         if (auth()->user()->hasPermissionTo('show-fast-react')) {
             $data = RoadObserved::leftjoin('edarate_shahri', 'road_observeds.edarate_shahri_id', 'edarate_shahri.id')
-                                ->where('rms_status', "<>", 0)
-                                ->whereNotNull('edarate_shahri_id')
-                                ->when($this->province_id, function($query, $province_id){
-                                    return $query->where('road_observeds.province_id', $province_id);
-                                })
-                                ->when(($fromDate && $toDate), function($query) use($fromDate, $toDate){
-                                    return $query->whereBetween('road_observeds.created_at', [$fromDate, $toDate]);
-                                })                                
-                                ->selectRaw('AutoID, road_observeds.id, Title, FeatureTypeTitle, MobileForSendEventSms,
+                ->where('rms_status', "<>", 0)
+                ->whereNotNull('edarate_shahri_id')
+                ->when($this->province_id, function ($query, $province_id) {
+                    return $query->where('road_observeds.province_id', $province_id);
+                })
+                ->when(($fromDate && $toDate), function ($query) use ($fromDate, $toDate) {
+                    return $query->whereBetween('road_observeds.created_at', [$fromDate, $toDate]);
+                })
+                ->selectRaw('fk_RegisteredEventMessage, road_observeds.id, Title, FeatureTypeTitle, MobileForSendEventSms,
                                              road_observeds.created_at, rms_last_activity, rms_last_activity_fa, status, 
                                              status_fa, supervisor_description, rms_description, province_fa, city_fa, Description, edarate_shahri.name_fa as edarate_shahri_name_fa, lat, lng')
-                                ->orderBy('status')
-                                ->orderBy('road_observeds.id', 'desc')
-                                ->get();
+                ->orderBy('status')
+                ->orderBy('road_observeds.id', 'desc')
+                ->get();
 
 
         } elseif (auth()->user()->hasPermissionTo('show-fast-react-province')) {
@@ -67,18 +67,18 @@ class ReportComplaintsExport implements FromView, ShouldAutoSize, WithEvents, Wi
             }
 
             $data = RoadObserved::leftjoin('edarate_shahri', 'road_observeds.edarate_shahri_id', 'edarate_shahri.id')
-                                ->where('rms_province_id', auth()->user()->province_id)
-                                ->where('rms_status', "<>", 0)
-                                ->whereNotNull('road_observeds.province_id')
-                                ->when(($fromDate && $toDate), function($query) use($fromDate, $toDate){
-                                    return $query->whereBetween('road_observeds.created_at', [$fromDate, $toDate]);
-                                })
-                                ->selectRaw('AutoID, road_observeds.id, Title, FeatureTypeTitle, MobileForSendEventSms,
+                ->where('rms_province_id', auth()->user()->province_id)
+                ->where('rms_status', "<>", 0)
+                ->whereNotNull('road_observeds.province_id')
+                ->when(($fromDate && $toDate), function ($query) use ($fromDate, $toDate) {
+                    return $query->whereBetween('road_observeds.created_at', [$fromDate, $toDate]);
+                })
+                ->selectRaw('fk_RegisteredEventMessage, road_observeds.id, Title, FeatureTypeTitle, MobileForSendEventSms,
                                              road_observeds.created_at, rms_last_activity, rms_last_activity_fa, status, 
                                              status_fa, supervisor_description, rms_description, province_fa, city_fa, Description, edarate_shahri.name_fa as edarate_shahri_name_fa, lat, lng')
-                                ->orderBy('status')
-                                ->orderBy('road_observeds.id', 'desc')
-                                ->get();                                 
+                ->orderBy('status')
+                ->orderBy('road_observeds.id', 'desc')
+                ->get();
 
         } elseif (auth()->user()->hasPermissionTo('show-fast-react-edarate-shahri')) {
             if (is_null(auth()->user()->edarate_shahri_id)) {
@@ -88,22 +88,22 @@ class ReportComplaintsExport implements FromView, ShouldAutoSize, WithEvents, Wi
             }
 
             $data = RoadObserved::leftjoin('edarate_shahri', 'road_observeds.edarate_shahri_id', 'edarate_shahri.id')
-                                ->where('edarate_shahri_id', auth()->user()->edarate_shahri_id)
-                                ->where('rms_status', "<>", 0)
-                                ->whereNotNull('edarate_shahri_id')
-                                ->when(($fromDate && $toDate), function($query) use($fromDate, $toDate){
-                                    return $query->whereBetween('road_observeds.created_at', [$fromDate, $toDate]);
-                                })
-                                ->selectRaw('AutoID, road_observeds.id, Title, FeatureTypeTitle, MobileForSendEventSms,
+                ->where('edarate_shahri_id', auth()->user()->edarate_shahri_id)
+                ->where('rms_status', "<>", 0)
+                ->whereNotNull('edarate_shahri_id')
+                ->when(($fromDate && $toDate), function ($query) use ($fromDate, $toDate) {
+                    return $query->whereBetween('road_observeds.created_at', [$fromDate, $toDate]);
+                })
+                ->selectRaw('fk_RegisteredEventMessage, road_observeds.id, Title, FeatureTypeTitle, MobileForSendEventSms,
                                              road_observeds.created_at, rms_last_activity, rms_last_activity_fa, status, 
                                              status_fa, supervisor_description, rms_description, province_fa, city_fa, Description, edarate_shahri.name_fa as edarate_shahri_name_fa, lat, lng')
-                                ->orderBy('status')
-                                ->orderBy('road_observeds.id', 'desc')
-                                ->get();            
-                                                        
-            
+                ->orderBy('status')
+                ->orderBy('road_observeds.id', 'desc')
+                ->get();
+
+
         }
-        
+
         return view('excel.V2.RoadObservation.report_complaints', [
             'data' => $data,
             'fromDate' => $fromDate,
@@ -113,11 +113,11 @@ class ReportComplaintsExport implements FromView, ShouldAutoSize, WithEvents, Wi
 
     /**
      * @return array
-    */
+     */
     public function registerEvents(): array
     {
         return [
-            AfterSheet::class => function(AfterSheet $event) {
+            AfterSheet::class => function (AfterSheet $event) {
                 $event->sheet->getDelegate()->setRightToLeft(true);
             },
         ];
@@ -133,7 +133,7 @@ class ReportComplaintsExport implements FromView, ShouldAutoSize, WithEvents, Wi
         $drawing->setOffsetX(5);
         $drawing->setOffsetY(5);
         $drawing->setCoordinates('A1');
-        
+
         $drawing2 = new Drawing();
         $drawing2->setName('Logo');
         $drawing2->setPath(public_path('/dist/141icon.png'));
@@ -150,7 +150,7 @@ class ReportComplaintsExport implements FromView, ShouldAutoSize, WithEvents, Wi
     {
         return [
             // Style the first row as bold text.
-            'A:BA' =>    [
+            'A:BA' => [
                 'font' => [
                     'name' => 'B Nazanin'
                 ]

app/Exports/V2/RoadObservation/SupervisorCartableExport.php

@@ -26,11 +26,11 @@ class SupervisorCartableExport implements FromView, ShouldAutoSize, WithEvents,
         $this->toDate = $toDate;
         $this->province_id = $province_id;
     }
-    
+
     public function view(): View
     {
-        $fromDate = $this->fromDate ? $this->fromDate . ' 00:00:00': null;
-        $toDate = $this->toDate ?  $this->toDate . ' 23:59:59': null;
+        $fromDate = $this->fromDate ? $this->fromDate . ' 00:00:00' : null;
+        $toDate = $this->toDate ? $this->toDate . ' 23:59:59' : null;
 
         $status = $this->status;
 
@@ -38,29 +38,29 @@ class SupervisorCartableExport implements FromView, ShouldAutoSize, WithEvents,
         if (auth()->user()->hasPermissionTo('supervise-fast-react')) {
 
             $data = RoadObserved::leftjoin('edarate_shahri', 'road_observeds.edarate_shahri_id', 'edarate_shahri.id')
-                                //  ->where('rms_status', '!=', 0)
-                                ->whereNotNull('road_observeds.status')
-                                ->when($this->id, function($query, $id){
-                                    return $query->where('road_observeds.id', 'LIKE', '%'. $id. '%');
-                                })
-                                ->when(!is_null($status), function($query) use ($status){
-                                    return $query->where('status', $status);
-                                })
-                                ->when(($fromDate && $toDate), function($query) use($fromDate, $toDate){
-                                    return $query->whereBetween('rms_last_activity', [$fromDate, $toDate]);
-                                })
-                                ->when($this->province_id, function($query, $province_id){
-                                    return $query->where('road_observeds.province_id', $province_id);
-                                })
-                                 //  ->where(function ($query) {
-                                //      $query->where('status', 0)
-                                //          ->orWhere('supervisor_id', auth()->user()->id);
-                                //  })
-                                ->selectRaw('AutoID, road_observeds.id, road_observeds.province_id, edarate_shahri.name_fa as edarate_shahri_name_fa, Title, FeatureTypeTitle, MobileForSendEventSms,
+                //  ->where('rms_status', '!=', 0)
+                ->whereNotNull('road_observeds.status')
+                ->when($this->id, function ($query, $id) {
+                    return $query->where('road_observeds.id', 'LIKE', '%' . $id . '%');
+                })
+                ->when(!is_null($status), function ($query) use ($status) {
+                    return $query->where('status', $status);
+                })
+                ->when(($fromDate && $toDate), function ($query) use ($fromDate, $toDate) {
+                    return $query->whereBetween('rms_last_activity', [$fromDate, $toDate]);
+                })
+                ->when($this->province_id, function ($query, $province_id) {
+                    return $query->where('road_observeds.province_id', $province_id);
+                })
+                //  ->where(function ($query) {
+                //      $query->where('status', 0)
+                //          ->orWhere('supervisor_id', auth()->user()->id);
+                //  })
+                ->selectRaw('fk_RegisteredEventMessage, road_observeds.id, road_observeds.province_id, edarate_shahri.name_fa as edarate_shahri_name_fa, Title, FeatureTypeTitle, MobileForSendEventSms,
                                              road_observeds.created_at, rms_last_activity, rms_last_activity_fa, status, status_fa, supervisor_description, rms_description, province_fa, city_fa')
-                                ->orderBy('status')
-                                ->orderBy('road_observeds.id', 'desc')
-                                ->get();
+                ->orderBy('status')
+                ->orderBy('road_observeds.id', 'desc')
+                ->get();
 
         } elseif (auth()->user()->hasPermissionTo('supervise-fast-react-province')) {
             if (is_null(auth()->user()->province_id)) {
@@ -70,30 +70,30 @@ class SupervisorCartableExport implements FromView, ShouldAutoSize, WithEvents,
             }
 
             $data = RoadObserved::leftjoin('edarate_shahri', 'road_observeds.edarate_shahri_id', 'edarate_shahri.id')
-                                //  ->where('rms_status', '!=', 0)
-                                ->where('road_observeds.province_id', auth()->user()->province_id)
-                                ->whereNotNull('road_observeds.status')
-                                ->when($this->id, function($query, $id){
-                                    return $query->where('road_observeds.id', 'LIKE', '%'. $id. '%');
-                                })
-                                ->when(!is_null($status), function($query) use ($status){
-                                    return $query->where('status', $status);
-                                })
-                                ->when(($fromDate && $toDate), function($query) use($fromDate, $toDate){
-                                    return $query->whereBetween('rms_last_activity', [$fromDate, $toDate]);
-                                })
-                                // ->when($this->province_id, function($query, $province_id){
-                                //     return $query->where('province_id', $province_id);
-                                // })
-                                 //  ->where(function ($query) {
-                                //      $query->where('status', 0)
-                                //          ->orWhere('supervisor_id', auth()->user()->id);
-                                //  })
-                                ->selectRaw('AutoID, road_observeds.id, road_observeds.province_id, edarate_shahri.name_fa as edarate_shahri_name_fa, Title, FeatureTypeTitle, MobileForSendEventSms,
+                //  ->where('rms_status', '!=', 0)
+                ->where('road_observeds.province_id', auth()->user()->province_id)
+                ->whereNotNull('road_observeds.status')
+                ->when($this->id, function ($query, $id) {
+                    return $query->where('road_observeds.id', 'LIKE', '%' . $id . '%');
+                })
+                ->when(!is_null($status), function ($query) use ($status) {
+                    return $query->where('status', $status);
+                })
+                ->when(($fromDate && $toDate), function ($query) use ($fromDate, $toDate) {
+                    return $query->whereBetween('rms_last_activity', [$fromDate, $toDate]);
+                })
+                // ->when($this->province_id, function($query, $province_id){
+                //     return $query->where('province_id', $province_id);
+                // })
+                //  ->where(function ($query) {
+                //      $query->where('status', 0)
+                //          ->orWhere('supervisor_id', auth()->user()->id);
+                //  })
+                ->selectRaw('fk_RegisteredEventMessage, road_observeds.id, road_observeds.province_id, edarate_shahri.name_fa as edarate_shahri_name_fa, Title, FeatureTypeTitle, MobileForSendEventSms,
                                              road_observeds.created_at, rms_last_activity, rms_last_activity_fa, status, status_fa, supervisor_description, rms_description, province_fa, city_fa')
-                                ->orderBy('status')
-                                ->orderBy('road_observeds.id', 'desc')
-                                ->get();
+                ->orderBy('status')
+                ->orderBy('road_observeds.id', 'desc')
+                ->get();
         }
 
         return view('excel.V2.RoadObservation.supervisor_cartable', [
@@ -105,11 +105,11 @@ class SupervisorCartableExport implements FromView, ShouldAutoSize, WithEvents,
 
     /**
      * @return array
-    */
+     */
     public function registerEvents(): array
     {
         return [
-            AfterSheet::class => function(AfterSheet $event) {
+            AfterSheet::class => function (AfterSheet $event) {
                 $event->sheet->getDelegate()->setRightToLeft(true);
             },
         ];
@@ -126,7 +126,7 @@ class SupervisorCartableExport implements FromView, ShouldAutoSize, WithEvents,
         $drawing->setOffsetX(5);
         $drawing->setOffsetY(5);
         $drawing->setCoordinates('A1');
-        
+
         $drawing2 = new Drawing();
         $drawing2->setName('Logo');
         $drawing2->setDescription('This is my logo');
@@ -144,7 +144,7 @@ class SupervisorCartableExport implements FromView, ShouldAutoSize, WithEvents,
 
         return [
             // Style the first row as bold text.
-            'A:BA' =>    [
+            'A:BA' => [
                 'font' => [
                     'name' => 'B Nazanin'
                 ]

app/Facades/Sms/SmsClass.php

@@ -15,7 +15,7 @@ class SmsClass
         if (App::environment('production')) {
             
 
-            $client = new SoapClient("http://sms1000.ir/webservice/sms.asmx?WSDL");
+            $client = new SoapClient("http://172.30.5.36/webservice/sms.asmx?WSDL");
             $date = date('d-m-y h:i:s');
             $date = str_replace(" ", "T", $date);
             $result = $client->Send(

app/Http/Controllers/CoridorsController.php

@@ -581,7 +581,7 @@ class CoridorsController extends Controller
                 $data = RoadItemsProject::with('files')->find($request->id);
                 break;
             case "2":
-                $data = RoadPatrolProject::find($request->id);
+                $data = RoadPatrol::find($request->id);
                 break;
             case "3":
                 $collection = \App\Models\ContractSubItems::whereId($request->id)->get();
@@ -725,13 +725,13 @@ class CoridorsController extends Controller
         }
         
         if ( in_array(2, $typeArrays) ) {
-            $roadPatrolProject = RoadPatrolProject::whereIn('start_way_id', $idArrays)
+            $roadPatrolProject = RoadPatrol::whereIn('start_way_id', $idArrays)
                                                             ->orWhereIn('end_way_id', $idArrays)
                                                             // ->when($date_to , function ($query) use ($date_to, $date_from) {
                                                             ->whereBetween('created_at', [$date_from . ' 00:00:00', $date_to . ' 23:59:59'])                           
                                                             // })
                                                             ->whereNotNull('start_lat')
-                                                            ->select('start_lat', 'start_lng', 'id')
+                                                            ->select('start_lat', 'start_lon', 'id')
                                                             ->get();
         }
         

app/Http/Controllers/NewRandDCtrl.php

@@ -16,6 +16,7 @@ use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Facades\Auth;
 use App\Models\RandDVoting;
 use Illuminate\Support\Str;
+use Illuminate\Support\Facades\URL;
 use App\Models\RandDVotingPaperAnswer;
 
 class NewRandDCtrl extends Controller
@@ -125,7 +126,7 @@ class NewRandDCtrl extends Controller
                     $item->setAttribute('Voting', true);
                     $getVote = RandDVoting::where('project_id', $item->id)->where('status', '2')->first();
                     if (! RandDVotingPaperAnswer::where('vote_id', $getVote->id)->where('user_id', Auth::user()->id)->first()) {
-                        $url = 'https://rms.rmto.ir/randd/voting/' . $getVote->id;
+                        $url = URL::to('/randd/voting') . '/'. $getVote->id;
                         $item->setAttribute('urlVoting', $url);
 
                         $item->setAttribute('allowVoting', true);

app/Http/Controllers/UserController.php

@@ -13,6 +13,7 @@ use App\Models\User;
 use Carbon\Carbon;
 use App\Models\City;
 use App\Models\Province;
+use Illuminate\Support\Facades\File;
 use App\Models\EdarateShahri;
 use App\Models\EdarateOstani;
 use Cache;
@@ -2111,7 +2112,7 @@ class UserController extends Controller
         $user->save();
 
         if ($request->has('avatar')) {
-            Storage::delete('public/' . $user->avatar);
+            File::delete($user->avatar);
             $destinationPath = 'avatar/' . $user->username;
             $filename = time() .".". $request->file('avatar')->getClientOriginalExtension();
             $request->file('avatar')->storeAs($destinationPath, $filename, 'public');

app/Http/Controllers/V2/Dashboard/RoadItemsProjectController.php

@@ -290,8 +290,8 @@ class RoadItemsProjectController extends Controller
             'city_id' => Auth::user()->city_id,
             'city_fa' => Auth::user()->city_fa,
             'user_name' => Auth::user()->name,
-            'start_way_id' => $nominatimService->get_way_id_from_nominatim(),
-            'end_way_id' => $end_coordinates ? $nominatimService->get_way_id_from_nominatim() : null,
+            'start_way_id' => $nominatimService->get_way_id_from_nominatim($start_coordinates[0], $start_coordinates[1]),
+            'end_way_id' => $end_coordinates ? $nominatimService->get_way_id_from_nominatim($end_coordinates[0], $end_coordinates[1]) : null,
             'unit_fa' => $info_item->sub_item_unit,
             'created_at_fa' => verta(\Carbon\Carbon::now())->format('Y-m-d H:i:s'),
             'info_id' => $info_item->id,

app/Http/Controllers/V2/Dashboard/RoadItemsReportController.php

@@ -90,9 +90,7 @@ class RoadItemsReportController extends Controller
         $province = $request->province_id;
         $all = array();
         $all = DB::select(
-            DB::raw(
                 'SELECT sub_item AS t,COUNT(*) AS c,CAST(SUM(CASE WHEN sub_item_data>0 THEN sub_item_data ELSE ABS(sub_item_data) END) AS UNSIGNED) AS s,province_id AS p, edarat_id AS ci FROM road_items_projects WHERE item = ' . $item . ' AND province_id = ' . $province . ' AND activity_date_time BETWEEN "' . $from_date . '" AND "' . $date_to . '" and status = 1 GROUP BY ci, sub_item'
-            )
         );
         $items_fa = InfoItem::where('item', $item)->get();
         foreach ($all as $value) {

app/Http/Controllers/V2/Dashboard/RoadObservationController.php

@@ -34,7 +34,7 @@ class RoadObservationController extends Controller
      */
     public function supervisorCartable()
     {
-        if (! auth()->user()->hasAnyPermission(['supervise-fast-react', 'supervise-fast-react-province'])) {
+        if (!auth()->user()->hasAnyPermission(['supervise-fast-react', 'supervise-fast-react-province'])) {
             abort(403);
         }
         auth()->user()->addActivityComplete(1137);
@@ -44,33 +44,52 @@ class RoadObservationController extends Controller
 
     public function supervisorShow(Request $request)
     {
-        if (! auth()->user()->hasAnyPermission(['supervise-fast-react', 'supervise-fast-react-province'])) {
+        if (!auth()->user()->hasAnyPermission(['supervise-fast-react', 'supervise-fast-react-province'])) {
             abort(403);
         }
 
         // if($request->dev)
         //     dd($request->query());
 
-        $fields = ['AutoID', 'road_observeds.id', 'Title', 'road_observeds.created_at', 'lat', 'lng',
-                   'FeatureTypeTitle', 'Description', 'MobileForSendEventSms',
-                   'rms_description','rms_status', 'rms_last_activity_fa', 'rms_last_activity', 'road_observeds.province_id', 'province_fa', 'city_fa', 'edarate_shahri.name_fa',
-                   'status', 'status_fa', 'supervisor_description', 'supervising_time'];
+        $fields = [
+            'fk_RegisteredEventMessage',
+            'road_observeds.id',
+            'Title',
+            'road_observeds.created_at',
+            'lat',
+            'lng',
+            'FeatureTypeTitle',
+            'Description',
+            'MobileForSendEventSms',
+            'rms_description',
+            'rms_status',
+            'rms_last_activity_fa',
+            'rms_last_activity',
+            'road_observeds.province_id',
+            'province_fa',
+            'city_fa',
+            'edarate_shahri.name_fa',
+            'status',
+            'status_fa',
+            'supervisor_description',
+            'supervising_time'
+        ];
 
         $aliases = ['', 'road_observeds_id', '', 'road_observeds_created_at', '', '', '', '', '', '', '', '', '', 'province_id', '', '', 'edarate_shahri_name_fa', '', '', '', ''];
 
         $selectRaw = makeSelectQuery($fields, $aliases);
 
         if (auth()->user()->hasPermissionTo('supervise-fast-react')) {
-            
+
             $query = RoadObserved::leftjoin('edarate_shahri', 'road_observeds.edarate_shahri_id', 'edarate_shahri.id')
-                                //  ->where('rms_status', '!=', 0)
-                                 ->whereNotNull('road_observeds.status')
-                                 //  ->where(function ($query) {
-                                //      $query->where('status', 0)
-                                //          ->orWhere('supervisor_id', auth()->user()->id);
-                                //  })
-                                ->selectRaw($selectRaw)
-                                ->selectRaw("CONCAT('https://rms.rmto.ir/',image_before) as image_before, CONCAT('https://rms.rmto.ir/', image_after) as image_after");
+                //  ->where('rms_status', '!=', 0)
+                ->whereNotNull('road_observeds.status')
+                //  ->where(function ($query) {
+                //      $query->where('status', 0)
+                //          ->orWhere('supervisor_id', auth()->user()->id);
+                //  })
+                ->selectRaw($selectRaw)
+                ->selectRaw("CONCAT('https://rms.rmto.ir/',image_before) as image_before, CONCAT('https://rms.rmto.ir/', image_after) as image_after");
 
         } elseif (auth()->user()->hasPermissionTo('supervise-fast-react-province')) {
             if (is_null(auth()->user()->province_id)) {
@@ -78,19 +97,19 @@ class RoadObservationController extends Controller
                     'message' => 'استانی برای شما در سامانه ثبت نشده است!'
                 ], 400);
             }
-            
+
             $query = RoadObserved::leftjoin('edarate_shahri', 'road_observeds.edarate_shahri_id', 'edarate_shahri.id')
-                                //  ->where('rms_status', '!=', 0)
-                                 ->where('road_observeds.province_id', auth()->user()->province_id)
-                                 ->whereNotNull('road_observeds.status')
-                                //  ->where(function ($query) {
-                                //      $query->where('status', 0)
-                                //          ->orWhere('supervisor_id', auth()->user()->id);
-                                //  })
-                                ->selectRaw($selectRaw)
-                                ->selectRaw("CONCAT('https://rms.rmto.ir/',image_before) as image_before, CONCAT('https://rms.rmto.ir/', image_after) as image_after");
+                //  ->where('rms_status', '!=', 0)
+                ->where('road_observeds.province_id', auth()->user()->province_id)
+                ->whereNotNull('road_observeds.status')
+                //  ->where(function ($query) {
+                //      $query->where('status', 0)
+                //          ->orWhere('supervisor_id', auth()->user()->id);
+                //  })
+                ->selectRaw($selectRaw)
+                ->selectRaw("CONCAT('https://rms.rmto.ir/',image_before) as image_before, CONCAT('https://rms.rmto.ir/', image_after) as image_after");
         }
-        
+
         $data = processDataTable($request, '', $fields, $query);
         return response()->json(
             $data,
@@ -135,14 +154,14 @@ class RoadObservationController extends Controller
 
     /**
      * Supervisor(End)
-    */
+     */
 
     /**
      * Operator(Begin)
-    */
+     */
     public function operatorCartable()
     {
-        if (! auth()->user()->hasAnyPermission(['show-fast-react-edarate-shahri', 'show-fast-react-province', 'show-fast-react'])) {
+        if (!auth()->user()->hasAnyPermission(['show-fast-react-edarate-shahri', 'show-fast-react-province', 'show-fast-react'])) {
             abort(403);
         }
         auth()->user()->addActivityComplete(1139);
@@ -152,14 +171,34 @@ class RoadObservationController extends Controller
 
     public function operatorShow(Request $request)
     {
-        if (! auth()->user()->hasAnyPermission(['show-fast-react-edarate-shahri', 'show-fast-react-province', 'show-fast-react'])) {
+        if (!auth()->user()->hasAnyPermission(['show-fast-react-edarate-shahri', 'show-fast-react-province', 'show-fast-react'])) {
             abort(403);
         }
 
-        $fields = ['AutoID', 'road_observeds.id', 'Title', 'road_observeds.created_at', 'lat', 'lng',
-                   'FeatureTypeTitle', 'Description', 'MobileForSendEventSms',
-                   'rms_description','rms_status','rms_start_latlng','rms_last_activity_fa','rms_last_activity', 'road_observeds.province_id', 'province_fa', 'city_fa', 'edarate_shahri.name_fa',
-                   'status', 'status_fa', 'supervisor_description', 'supervising_time'];
+        $fields = [
+            'fk_RegisteredEventMessage',
+            'road_observeds.id',
+            'Title',
+            'road_observeds.created_at',
+            'lat',
+            'lng',
+            'FeatureTypeTitle',
+            'Description',
+            'MobileForSendEventSms',
+            'rms_description',
+            'rms_status',
+            'rms_start_latlng',
+            'rms_last_activity_fa',
+            'rms_last_activity',
+            'road_observeds.province_id',
+            'province_fa',
+            'city_fa',
+            'edarate_shahri.name_fa',
+            'status',
+            'status_fa',
+            'supervisor_description',
+            'supervising_time'
+        ];
 
         $aliases = ['', 'road_observeds_id', '', 'road_observeds_created_at', '', '', '', '', '', '', '', '', '', '', 'province_id', '', '', 'edarate_shahri_name_fa', '', '', '', ''];
 
@@ -167,11 +206,11 @@ class RoadObservationController extends Controller
 
         if (auth()->user()->hasPermissionTo('show-fast-react')) {
             $query = RoadObserved::leftjoin('edarate_shahri', 'road_observeds.edarate_shahri_id', 'edarate_shahri.id')
-                                ->where('rms_status', '!=', 0)
-                                ->whereNotNull('road_observeds.province_id')
-                                ->whereNotNull('status')
-                                ->selectRaw($selectRaw)
-                                ->selectRaw("CONCAT('https://rms.rmto.ir/',image_before) as image_before, CONCAT('https://rms.rmto.ir/', image_after) as image_after");
+                ->where('rms_status', '!=', 0)
+                ->whereNotNull('road_observeds.province_id')
+                ->whereNotNull('status')
+                ->selectRaw($selectRaw)
+                ->selectRaw("CONCAT('https://rms.rmto.ir/',image_before) as image_before, CONCAT('https://rms.rmto.ir/', image_after) as image_after");
         } elseif (auth()->user()->hasPermissionTo('show-fast-react-province')) {
             if (is_null(auth()->user()->province_id)) {
                 return response()->json([
@@ -180,12 +219,12 @@ class RoadObservationController extends Controller
             }
 
             $query = RoadObserved::leftjoin('edarate_shahri', 'road_observeds.edarate_shahri_id', 'edarate_shahri.id')
-                                ->where('rms_province_id', auth()->user()->province_id)
-                                ->where('rms_status', '!=', 0)
-                                ->whereNotNull('road_observeds.province_id')
-                                ->whereNotNull('status')
-                                ->selectRaw($selectRaw)
-                                ->selectRaw("CONCAT('https://rms.rmto.ir/',image_before) as image_before, CONCAT('https://rms.rmto.ir/', image_after) as image_after");
+                ->where('rms_province_id', auth()->user()->province_id)
+                ->where('rms_status', '!=', 0)
+                ->whereNotNull('road_observeds.province_id')
+                ->whereNotNull('status')
+                ->selectRaw($selectRaw)
+                ->selectRaw("CONCAT('https://rms.rmto.ir/',image_before) as image_before, CONCAT('https://rms.rmto.ir/', image_after) as image_after");
         } elseif (auth()->user()->hasPermissionTo('show-fast-react-edarate-shahri')) {
             if (is_null(auth()->user()->edarate_shahri_id)) {
                 return response()->json([
@@ -194,12 +233,12 @@ class RoadObservationController extends Controller
             }
 
             $query = RoadObserved::leftjoin('edarate_shahri', 'road_observeds.edarate_shahri_id', 'edarate_shahri.id')
-                                ->where('edarate_shahri_id', auth()->user()->edarate_shahri_id)
-                                ->where('rms_status', '!=', 0)
-                                ->whereNotNull('road_observeds.province_id')
-                                ->whereNotNull('status')
-                                ->selectRaw($selectRaw)
-                                ->selectRaw("CONCAT('https://rms.rmto.ir/',image_before) as image_before, CONCAT('https://rms.rmto.ir/', image_after) as image_after");
+                ->where('edarate_shahri_id', auth()->user()->edarate_shahri_id)
+                ->where('rms_status', '!=', 0)
+                ->whereNotNull('road_observeds.province_id')
+                ->whereNotNull('status')
+                ->selectRaw($selectRaw)
+                ->selectRaw("CONCAT('https://rms.rmto.ir/',image_before) as image_before, CONCAT('https://rms.rmto.ir/', image_after) as image_after");
         }
 
         $data = processDataTable($request, '', $fields, $query);
@@ -217,11 +256,11 @@ class RoadObservationController extends Controller
     }
     /**
      * Operator(End)
-    */
+     */
 
     public function pendingView()
     {
-        if (! auth()->user()->hasAnyPermission(['show-fast-react-edarate-shahri', 'show-fast-react-province', 'show-fast-react'])) {
+        if (!auth()->user()->hasAnyPermission(['show-fast-react-edarate-shahri', 'show-fast-react-province', 'show-fast-react'])) {
             abort(403);
         }
         auth()->user()->addActivityComplete(1140);
@@ -231,7 +270,7 @@ class RoadObservationController extends Controller
 
     public function count()
     {
-        if (! auth()->user()->permissions()->where('type', 'fastreact')->exists()) {
+        if (!auth()->user()->permissions()->where('type', 'fastreact')->exists()) {
             abort(403);
         }
 
@@ -241,9 +280,9 @@ class RoadObservationController extends Controller
 
         if (auth()->user()->hasPermissionTo('show-fast-react')) {
             $data = RoadObserved::whereBetween('created_at', [$from_datetime, $to_datetime])
-                                ->selectRaw('sum(case when rms_status = 0 then 1 else 0 end) as pending,
+                ->selectRaw('sum(case when rms_status = 0 then 1 else 0 end) as pending,
                                              sum(case when rms_status != 0 then 1 else 0 end) as done')
-                                ->get();
+                ->get();
         } elseif (auth()->user()->hasPermissionTo('show-fast-react-province')) {
             if (!auth()->user()->province_id) {
                 return response()->json([
@@ -252,10 +291,10 @@ class RoadObservationController extends Controller
             }
 
             $data = RoadObserved::where('rms_province_id', Auth::user()->province_id)
-                            ->whereBetween('created_at', [$from_datetime, $to_datetime])
-                            ->selectRaw('sum(case when rms_status = 0 then 1 else 0 end) as pending,
+                ->whereBetween('created_at', [$from_datetime, $to_datetime])
+                ->selectRaw('sum(case when rms_status = 0 then 1 else 0 end) as pending,
                                          sum(case when rms_status != 0 then 1 else 0 end) as done')
-                            ->get();
+                ->get();
         } elseif (auth()->user()->hasPermissionTo('show-fast-react-city')) {
             if (!auth()->user()->city_id) {
                 return response()->json([
@@ -264,10 +303,10 @@ class RoadObservationController extends Controller
             }
 
             $data = RoadObserved::where('rms_city_id', Auth::user()->city_id)
-                            ->whereBetween('created_at', [$from_datetime, $to_datetime])
-                            ->selectRaw('sum(case when rms_status = 0 then 1 else 0 end) as pending,
+                ->whereBetween('created_at', [$from_datetime, $to_datetime])
+                ->selectRaw('sum(case when rms_status = 0 then 1 else 0 end) as pending,
                                          sum(case when rms_status != 0 then 1 else 0 end) as done')
-                            ->get();
+                ->get();
         }
 
         return response()->json([
@@ -278,15 +317,28 @@ class RoadObservationController extends Controller
 
     public function showPending(Request $request)
     {
-        if (! auth()->user()->hasAnyPermission(['show-fast-react-edarate-shahri', 'show-fast-react-province', 'show-fast-react'])) {
+        if (!auth()->user()->hasAnyPermission(['show-fast-react-edarate-shahri', 'show-fast-react-province', 'show-fast-react'])) {
             abort(403);
         }
 
-        if($request->dev)
+        if ($request->dev)
             dd(auth()->user()->permissions->pluck('name'));
 
-        $fields = ['AutoID', 'road_observeds.id', 'Title', 'road_observeds.created_at', 'lat', 'lng',
-        'FeatureTypeTitle', 'Description', 'MobileForSendEventSms', 'road_observeds.province_id','province_fa', 'city_fa', 'edarate_shahri.name_fa'];
+        $fields = [
+            'fk_RegisteredEventMessage',
+            'road_observeds.id',
+            'Title',
+            'road_observeds.created_at',
+            'lat',
+            'lng',
+            'FeatureTypeTitle',
+            'Description',
+            'MobileForSendEventSms',
+            'road_observeds.province_id',
+            'province_fa',
+            'city_fa',
+            'edarate_shahri.name_fa'
+        ];
 
         $aliases = ['', 'road_observeds_id', '', 'road_observeds_created_at', '', '', '', '', '', 'province_id', '', '', 'edarate_shahri_name_fa'];
 
@@ -294,9 +346,9 @@ class RoadObservationController extends Controller
 
         if (auth()->user()->hasPermissionTo('show-fast-react')) {
             $query = RoadObserved::leftjoin('edarate_shahri', 'road_observeds.edarate_shahri_id', 'edarate_shahri.id')
-                                 ->where('rms_status', 0)
-                                 ->whereNotNull('edarate_shahri_id')
-                                 ->selectRaw($selectRaw);
+                ->where('rms_status', 0)
+                ->whereNotNull('edarate_shahri_id')
+                ->selectRaw($selectRaw);
         } elseif (auth()->user()->hasPermissionTo('show-fast-react-province')) {
             if (is_null(auth()->user()->province_id)) {
                 return response()->json([
@@ -305,10 +357,10 @@ class RoadObservationController extends Controller
             }
 
             $query = RoadObserved::leftjoin('edarate_shahri', 'road_observeds.edarate_shahri_id', 'edarate_shahri.id')
-                                 ->where('rms_status', 0)
-                                 ->whereNotNull('edarate_shahri_id')
-                                 ->where('road_observeds.province_id', auth()->user()->province_id)
-                                 ->selectRaw($selectRaw);
+                ->where('rms_status', 0)
+                ->whereNotNull('edarate_shahri_id')
+                ->where('road_observeds.province_id', auth()->user()->province_id)
+                ->selectRaw($selectRaw);
 
             // dd(2);
         } elseif (auth()->user()->hasPermissionTo('show-fast-react-edarate-shahri')) {
@@ -319,22 +371,22 @@ class RoadObservationController extends Controller
             }
 
             $query = RoadObserved::leftjoin('edarate_shahri', 'road_observeds.edarate_shahri_id', 'edarate_shahri.id')
-                                 ->where('rms_status', 0)
-                                 ->whereNotNull('edarate_shahri_id')
-                                 ->where('edarate_shahri_id', auth()->user()->edarate_shahri_id)
-                                 ->selectRaw($selectRaw);
-            
+                ->where('rms_status', 0)
+                ->whereNotNull('edarate_shahri_id')
+                ->where('edarate_shahri_id', auth()->user()->edarate_shahri_id)
+                ->selectRaw($selectRaw);
+
         }
 
         $data = processDataTable($request, '', $fields, $query);
-        
+
         return response()->json(
             $data,
             $data['status'],
         );
     }
 
-    
+
 
     public function referList(int $id)
     {
@@ -346,6 +398,20 @@ class RoadObservationController extends Controller
             'data' => $edarat_shahri,
         ]);
     }
+    public function referReport(Request $request, RoadObserved $roadObserved)
+    {
+        $data = RoadObservationHistory::where('road_observation_histories.id', $roadObserved->id)->where('action', 'refer')->get();
+        foreach ($data as $key => $value) {
+            $data[$key]->from_edareh = EdarateShahri::find($value->from_edareh)->name_fa;
+            $data[$key]->to_edareh = EdarateShahri::find($value->to_edareh)->name_fa;
+            $user = User::find($value->user_id);
+            $data[$key]->user = $user->first_name . ' ' . $user->last_name;
+        }
+        return response()->json([
+            'status' => 200,
+            'data' => $data,
+        ]);
+    }
 
     public function refer(Request $request, RoadObserved $roadObserved)
     {
@@ -359,18 +425,20 @@ class RoadObservationController extends Controller
                 'message' => 'access to requested resource is forbidden.'
             ], 403);
         }
-
+        $from_edareh = $roadObserved->edarate_shahri_id;
         $roadObserved->update([
             'edarate_shahri_id' => $request->edarate_shahri_id,
         ]);
-        
+
         RoadObservationHistory::create([
             'id' => $roadObserved->id,
             'user_id' => auth()->user()->id,
             'action' => 'refer',
             'description' => $request->refer_description,
+            'from_edareh' => $from_edareh,
+            'to_edareh' => $request->edarate_shahri_id
         ]);
-        
+
         auth()->user()->addActivityComplete(1037);
         return response()->json([
             'status' => 'succeed',
@@ -381,7 +449,7 @@ class RoadObservationController extends Controller
 
     public function restore(Request $request, RoadObserved $roadObserved)
     {
-        if (! auth()->user()->hasPermissionTo('restore-fast-react')) {
+        if (!auth()->user()->hasPermissionTo('restore-fast-react')) {
             abort(403);
         }
 
@@ -391,12 +459,12 @@ class RoadObservationController extends Controller
 
         if ($roadObserved->image_before) {
             $before_path = explode('/', $roadObserved->image_before);
-            Storage::delete('public/'. implode('/', array_slice($before_path, 1)));
+            Storage::delete('public/' . implode('/', array_slice($before_path, 1)));
         }
 
         if ($roadObserved->image_after) {
             $after_path = explode('/', $roadObserved->image_after);
-            Storage::delete('public/'. implode('/', array_slice($after_path, 1)));
+            Storage::delete('public/' . implode('/', array_slice($after_path, 1)));
         }
 
         $roadObserved->update([
@@ -417,7 +485,7 @@ class RoadObservationController extends Controller
             'action' => 'restore',
             'description' => $request->restore_description,
         ]);
-        
+
         auth()->user()->addActivityComplete(1141);
         return response()->json([
             'status' => 'succeed',
@@ -428,7 +496,7 @@ class RoadObservationController extends Controller
 
     public function handle(Request $request, RoadObserved $roadObserved, NikarayanService $nikarayanService)
     {
-        if (! auth()->user()->hasAnyPermission(['show-fast-react-edarate-shahri', 'show-fast-react-province', 'show-fast-react'])) {
+        if (!auth()->user()->hasAnyPermission(['show-fast-react-edarate-shahri', 'show-fast-react-province', 'show-fast-react'])) {
             return response()->json([
                 'message' => 'access to requested resource is forbidden.'
             ], 403);
@@ -439,16 +507,16 @@ class RoadObservationController extends Controller
         $file_time = time();
         // $uuid = \Uuid::generate();
         $uuid = (string) Str::uuid();
-        
+
         if ($request->file('image-before-1')) {
             $roadObserved->files()->where('path', 'like', '%_image-before-1_%')->delete();
 
             $files_path[$file_index]['path'] = $request->file('image-before-1')->storeAs(
                 'public/road_observeds',
-                'img4_' . $file_time . '_image-before-1_' . $roadObserved->id . '_' . $uuid.'.'. $request->file('image-before-1')->extension()
+                'img4_' . $file_time . '_image-before-1_' . $roadObserved->id . '_' . $uuid . '.' . $request->file('image-before-1')->extension()
             );
             $file_index++;
-            $roadObserved->image_before = 'storage/road_observeds/'.'img4_' . $file_time . '_image-before-1_' . $roadObserved->id . '_' . $uuid.'.'. $request->file('image-before-1')->extension();
+            $roadObserved->image_before = 'storage/road_observeds/' . 'img4_' . $file_time . '_image-before-1_' . $roadObserved->id . '_' . $uuid . '.' . $request->file('image-before-1')->extension();
         }
 
         if ($request->file('image-after-1')) {
@@ -456,14 +524,14 @@ class RoadObservationController extends Controller
 
             $files_path[$file_index]['path'] = $request->file('image-after-1')->storeAs(
                 'public/road_observeds',
-                'img4_' . $file_time . '_image-after-1_' . $roadObserved->id . '_' . $uuid.'.'. $request->file('image-after-1')->extension()
+                'img4_' . $file_time . '_image-after-1_' . $roadObserved->id . '_' . $uuid . '.' . $request->file('image-after-1')->extension()
             );
             $file_index++;
-            $roadObserved->image_after = 'storage/road_observeds/'.'img4_' . $file_time . '_image-after-1_' . $roadObserved->id . '_' . $uuid.'.'.$request->file('image-after-1')->extension();
+            $roadObserved->image_after = 'storage/road_observeds/' . 'img4_' . $file_time . '_image-after-1_' . $roadObserved->id . '_' . $uuid . '.' . $request->file('image-after-1')->extension();
         }
 
         ///////  milad i uncomment this
-        $files =  json_encode($files_path);
+        $files = json_encode($files_path);
         $roadObserved->problemHistories()->create([
             'user_id' => Auth::user()->id, //$request->user()->id,// 470
             'previous_rms_status' => $roadObserved->rms_status,
@@ -474,13 +542,13 @@ class RoadObservationController extends Controller
         ]);
 
         $roadObserved->rms_status = $request->input('rms-status') ?? $roadObserved->rms_status;
-        if ($request->input('rms-start-latlng')) {
-            $roadObserved->rms_start_latlng = explode(',', $request->input('rms-start-latlng')) ?? null;
+        if ($request->input('start_point')) {
+            $roadObserved->rms_start_latlng = explode(',', $request->input('start_point')) ?? null;
         }
-        if ($request->input('rms-end-latlng')) {
-            $roadObserved->rms_end_latlng = explode(',', $request->input('rms-end-latlng')) ?? null;
-        }
-        $roadObserved->rms_description = $request->input('rms-description') ?? $roadObserved->rms_description;
+        // if ($request->input('rms-end-latlng')) {
+        //     $roadObserved->rms_end_latlng = explode(',', $request->input('rms-end-latlng')) ?? null;
+        // }
+        $roadObserved->rms_description = $request->input('description') ?? $roadObserved->rms_description;
 
         $now_date_time = Carbon::now();
         $roadObserved->updated_at_fa = Verta::instance($now_date_time);
@@ -503,10 +571,10 @@ class RoadObservationController extends Controller
         try {
             $result = $nikarayanService->updateRoadObservedInfoByNikarayan($request, $roadObserved, $files);
         } catch (SoapFault $e) {
-            
-            $msg = "error in send to nikarayan at".date("Y-m-d H:i:s")."\n".'rms: error in get road observation webservice babe!!!!'."\n";
+
+            $msg = "error in send to nikarayan at" . date("Y-m-d H:i:s") . "\n" . 'rms: error in get road observation webservice babe!!!!' . "\n";
             $msg .= $e->getMessage();
-            
+
             Sms::sendSms(env('RMS_CTO_PHONE_NUMBER'), $msg);
         }
         ///// sms send

app/Http/Controllers/V2/Dashboard/RoadObservationReportController.php

@@ -25,28 +25,43 @@ class RoadObservationReportController extends Controller
         if ($request->from_date && $request->date_to) {
             $from_date = $request->from_date;
             $date_to = $request->date_to;
-            $from_date = $from_date.' 00:00:00';
-            $date_to = $date_to.' 23:59:59';
+            $from_date = $from_date . ' 00:00:00';
+            $date_to = $date_to . ' 23:59:59';
         } else {
             $from_date = Date('Y-m-d');
-            $from_date = $from_date.' 00:00:00';
+            $from_date = $from_date . ' 00:00:00';
             $date_to = Date('Y-m-d');
-            $date_to = $date_to.' 23:59:59';
+            $date_to = $date_to . ' 23:59:59';
         }
 
 
-        $fields = ['AutoID', 'road_observeds.id', 'Title', 'road_observeds.created_at', 'lat', 'lng',
-        'FeatureTypeTitle', 'Description', 'MobileForSendEventSms', 'road_observeds.province_id','province_fa', 'city_fa', 'edarate_shahri.name_fa', 'rms_last_activity_fa', 'rms_description'];
+        $fields = [
+            'fk_RegisteredEventMessage',
+            'road_observeds.id',
+            'Title',
+            'road_observeds.created_at',
+            'lat',
+            'lng',
+            'FeatureTypeTitle',
+            'Description',
+            'MobileForSendEventSms',
+            'road_observeds.province_id',
+            'province_fa',
+            'city_fa',
+            'edarate_shahri.name_fa',
+            'rms_last_activity_fa',
+            'rms_description'
+        ];
 
         $aliases = ['', 'road_observeds_id', '', 'road_observeds_created_at', '', '', '', '', '', 'province_id', '', '', 'edarate_shahri_name_fa', '', ''];
 
         $selectRaw = makeSelectQuery($fields, $aliases);
 
         $query = RoadObserved::leftjoin('edarate_shahri', 'road_observeds.edarate_shahri_id', 'edarate_shahri.id')
-                                ->where('rms_status', "<>", 0)
-                                ->whereNotNull('edarate_shahri_id')
-                                ->whereBetween('road_observeds.created_at', [$from_date . ' 00:00:00', $date_to . ' 23:59:59'])
-                                ->selectRaw($selectRaw);
+            ->where('rms_status', "<>", 0)
+            ->whereNotNull('edarate_shahri_id')
+            ->whereBetween('road_observeds.created_at', [$from_date . ' 00:00:00', $date_to . ' 23:59:59'])
+            ->selectRaw($selectRaw);
 
         $data = processDataTable($request, '', $fields, $query);
 
@@ -61,13 +76,13 @@ class RoadObservationReportController extends Controller
         if ($request->from_date && $request->date_to) {
             $from_date = $request->from_date;
             $date_to = $request->date_to;
-            $from_date = $from_date.' 00:00:00';
-            $date_to = $date_to.' 23:59:59';
+            $from_date = $from_date . ' 00:00:00';
+            $date_to = $date_to . ' 23:59:59';
         } else {
             $from_date = Date('Y-m-d');
-            $from_date = $from_date.' 00:00:00';
+            $from_date = $from_date . ' 00:00:00';
             $date_to = Date('Y-m-d');
-            $date_to = $date_to.' 23:59:59';
+            $date_to = $date_to . ' 23:59:59';
         }
 
         $all = DB::select(DB::raw(
@@ -90,10 +105,10 @@ class RoadObservationReportController extends Controller
             (SELECT COUNT(*)  FROM `observed_items` oi WHERE rp.`id`= oi.road_patrol_id) AS tedad_mavarede_moshede_shode,
             (SELECT COUNT(*) FROM `observed_items` oii WHERE rp.`id`= oii.road_patrol_id AND oii.road_item_id IS NOT NULL AND priority IS NOT NULL) AS tedad_mavarede_peygiri_shode,
             (SELECT COUNT(*) FROM `observed_items` oii WHERE rp.`id`= oii.road_patrol_id AND oii.road_item_id IS NOT NULL AND priority IS NULL) AS tedad_faliyat_sabt_shode
-            FROM `road_patrols` rp where rp.province_id = "'.$request->province_id.'" AND rp.start_time BETWEEN "'.$from_date.'" AND "'.$date_to.'") temp 
+            FROM `road_patrols` rp where rp.province_id = "' . $request->province_id . '" AND rp.start_time BETWEEN "' . $from_date . '" AND "' . $date_to . '") temp 
             GROUP BY city_id
             '
-            ));
+        ));
         return response()->json([
             'status' => 'succeed',
             'message' => '',
@@ -117,20 +132,22 @@ class RoadObservationReportController extends Controller
         if ($request->from_date && $request->date_to) {
             $from_date = $request->from_date;
             $date_to = $request->date_to;
-            $from_date = $from_date.' 00:00:00';
-            $date_to = $date_to.' 23:59:59';
+            $from_date = $from_date . ' 00:00:00';
+            $date_to = $date_to . ' 23:59:59';
         } else {
             $from_date = Date('Y-m-d');
-            $from_date = $from_date.' 00:00:00';
+            $from_date = $from_date . ' 00:00:00';
             $date_to = Date('Y-m-d');
-            $date_to = $date_to.' 23:59:59';
+            $date_to = $date_to . ' 23:59:59';
         }
         $item = $request->item;
         $all = array();
         $all = DB::select(DB::raw(
-            'SELECT sub_item AS t,COUNT(*) AS c,CAST(SUM(CASE WHEN sub_item_data>0 THEN sub_item_data ELSE ABS(sub_item_data) END) AS UNSIGNED) AS s,province_id AS p FROM road_items_projects WHERE item = '.$item.' AND activity_date_time BETWEEN "'.$from_date.'" AND "'.$date_to.'" and status = 1 GROUP BY p, sub_item'));
-        $country =DB::select(DB::raw(
-            'SELECT sub_item AS t,COUNT(*) AS c,CAST(SUM(CASE WHEN sub_item_data>0 THEN sub_item_data ELSE ABS(sub_item_data) END) AS UNSIGNED) AS s, -1 AS p FROM road_items_projects WHERE item = '.$item.' AND activity_date_time BETWEEN "'.$from_date.'" AND "'.$date_to.'" and status = 1 GROUP BY sub_item'));
+            'SELECT sub_item AS t,COUNT(*) AS c,CAST(SUM(CASE WHEN sub_item_data>0 THEN sub_item_data ELSE ABS(sub_item_data) END) AS UNSIGNED) AS s,province_id AS p FROM road_items_projects WHERE item = ' . $item . ' AND activity_date_time BETWEEN "' . $from_date . '" AND "' . $date_to . '" and status = 1 GROUP BY p, sub_item'
+        ));
+        $country = DB::select(DB::raw(
+            'SELECT sub_item AS t,COUNT(*) AS c,CAST(SUM(CASE WHEN sub_item_data>0 THEN sub_item_data ELSE ABS(sub_item_data) END) AS UNSIGNED) AS s, -1 AS p FROM road_items_projects WHERE item = ' . $item . ' AND activity_date_time BETWEEN "' . $from_date . '" AND "' . $date_to . '" and status = 1 GROUP BY sub_item'
+        ));
         $items_fa = InfoItem::where('item', $item)->get();
         foreach ($all as $value) {
             foreach ($items_fa as $val) {
@@ -143,7 +160,7 @@ class RoadObservationReportController extends Controller
             'status' => 'succeed',
             'message' => '',
             'data' => $all,
-            'country' =>$country,
+            'country' => $country,
             'items_fa' => $items_fa
         ], 200);
     }
@@ -151,19 +168,20 @@ class RoadObservationReportController extends Controller
     {
         $item = $request->item;
         if ($request->from_date && $request->date_to) {
-            $from_date = $request->from_date.' 00:00:00';
-            $date_to = $request->date_to.' 23:59:59';
+            $from_date = $request->from_date . ' 00:00:00';
+            $date_to = $request->date_to . ' 23:59:59';
         } else {
             $from_date = Date('Y-m-d');
-            $from_date = $from_date.' 00:00:00';
+            $from_date = $from_date . ' 00:00:00';
             $date_to = Date('Y-m-d');
-            $date_to = $date_to.' 23:59:59';
+            $date_to = $date_to . ' 23:59:59';
         }
         $item = $request->item;
         $province = $request->province_id;
         $all = array();
         $all = DB::select(DB::raw(
-            'SELECT sub_item AS t,COUNT(*) AS c,CAST(SUM(CASE WHEN sub_item_data>0 THEN sub_item_data ELSE ABS(sub_item_data) END) AS UNSIGNED) AS s,province_id AS p, city_id AS ci FROM road_items_projects WHERE item = '.$item.' AND province_id = '.$province.' AND activity_date_time BETWEEN "'.$from_date.'" AND "'.$date_to.'" and status = 1 GROUP BY ci, sub_item'));
+            'SELECT sub_item AS t,COUNT(*) AS c,CAST(SUM(CASE WHEN sub_item_data>0 THEN sub_item_data ELSE ABS(sub_item_data) END) AS UNSIGNED) AS s,province_id AS p, city_id AS ci FROM road_items_projects WHERE item = ' . $item . ' AND province_id = ' . $province . ' AND activity_date_time BETWEEN "' . $from_date . '" AND "' . $date_to . '" and status = 1 GROUP BY ci, sub_item'
+        ));
         $items_fa = InfoItem::where('item', $item)->get();
         foreach ($all as $value) {
             foreach ($items_fa as $val) {
@@ -195,35 +213,35 @@ class RoadObservationReportController extends Controller
         if (Auth::user()->username == 'witel' || Auth::user()->username == 'drdanesh') {
             $sql = "SELECT COUNT(*) AS s,province_id AS p,item AS i
             FROM road_items_projects WHERE
-            road_items_projects.status = 1 and road_items_projects.activity_date_time BETWEEN '".$from_date." 00:00:00' and '".$date_to." 23:59:59' GROUP BY province_id,item
+            road_items_projects.status = 1 and road_items_projects.activity_date_time BETWEEN '" . $from_date . " 00:00:00' and '" . $date_to . " 23:59:59' GROUP BY province_id,item
             UNION 
             SELECT COUNT(*) AS s,province_id AS p,77 AS i FROM road_patrols 
             WHERE
-            start_time BETWEEN '".$from_date." 00:00:00' and '".$date_to." 23:59:59' GROUP BY province_id
+            start_time BETWEEN '" . $from_date . " 00:00:00' and '" . $date_to . " 23:59:59' GROUP BY province_id
             UNION
             SELECT COUNT(*) AS s,-1 AS p,item AS i FROM road_items_projects
-            WHERE road_items_projects.status = 1 and road_items_projects.activity_date_time BETWEEN '".$from_date." 00:00:00' and '".$date_to." 23:59:59'
+            WHERE road_items_projects.status = 1 and road_items_projects.activity_date_time BETWEEN '" . $from_date . " 00:00:00' and '" . $date_to . " 23:59:59'
             GROUP BY item
             UNION
             SELECT COUNT(*) AS s,-1 AS p,77 AS i FROM road_patrols 
-            WHERE start_time BETWEEN '".$from_date." 00:00:00' and '".$date_to." 23:59:59'";
+            WHERE start_time BETWEEN '" . $from_date . " 00:00:00' and '" . $date_to . " 23:59:59'";
         } else {
 
             $province_id = Auth::user()->province_id;
             $sql = "SELECT COUNT(*) AS s,province_id AS p,item AS i
-            FROM road_items_projects WHERE road_items_projects.status = 1 and road_items_projects.province_id = ".$province_id." and 
-            road_items_projects.activity_date_time BETWEEN '".$from_date." 00:00:00' and '".$date_to." 23:59:59' GROUP BY province_id,item
+            FROM road_items_projects WHERE road_items_projects.status = 1 and road_items_projects.province_id = " . $province_id . " and 
+            road_items_projects.activity_date_time BETWEEN '" . $from_date . " 00:00:00' and '" . $date_to . " 23:59:59' GROUP BY province_id,item
             UNION 
             SELECT COUNT(*) AS s,province_id AS p,77 AS i FROM road_patrols 
-            WHERE road_patrols.province_id = ".$province_id." and
-            road_patrols.start_time BETWEEN '".$from_date." 00:00:00' and '".$date_to." 23:59:59' GROUP BY province_id
+            WHERE road_patrols.province_id = " . $province_id . " and
+            road_patrols.start_time BETWEEN '" . $from_date . " 00:00:00' and '" . $date_to . " 23:59:59' GROUP BY province_id
             UNION
             SELECT COUNT(*) AS s,-1 AS p,item AS i FROM road_items_projects
-            WHERE road_items_projects.status = 1 and road_items_projects.province_id = ".$province_id." and road_items_projects.activity_date_time BETWEEN '".$from_date." 00:00:00' and '".$date_to." 23:59:59'
+            WHERE road_items_projects.status = 1 and road_items_projects.province_id = " . $province_id . " and road_items_projects.activity_date_time BETWEEN '" . $from_date . " 00:00:00' and '" . $date_to . " 23:59:59'
             GROUP BY item
             UNION
             SELECT COUNT(*) AS s,-1 AS p,77 AS i FROM road_patrols 
-            WHERE  road_patrols.province_id = ".$province_id." and road_patrols.start_time BETWEEN '".$from_date." 00:00:00' and '".$date_to." 23:59:59'";
+            WHERE  road_patrols.province_id = " . $province_id . " and road_patrols.start_time BETWEEN '" . $from_date . " 00:00:00' and '" . $date_to . " 23:59:59'";
         }
         // dd($sql);
         $data = DB::select(DB::raw($sql));
@@ -247,13 +265,13 @@ class RoadObservationReportController extends Controller
 
         $sql = "SELECT COUNT(*) AS s,city_id AS c,item AS i
         FROM road_items_projects where
-        status = 1 and road_items_projects.activity_date_time between '".$from_date." 00:00:00' and '".$date_to." 23:59:59'
-        and province_id= '".$p."' GROUP BY item,city_id
+        status = 1 and road_items_projects.activity_date_time between '" . $from_date . " 00:00:00' and '" . $date_to . " 23:59:59'
+        and province_id= '" . $p . "' GROUP BY item,city_id
         UNION 
         SELECT COUNT(*) AS s,city_id AS c,77 AS i FROM road_patrols 
         where
-        road_patrols.start_time between '".$from_date." 00:00:00' and '".$date_to." 23:59:59' 
-        and province_id= '".$p."' GROUP BY city_id";
+        road_patrols.start_time between '" . $from_date . " 00:00:00' and '" . $date_to . " 23:59:59' 
+        and province_id= '" . $p . "' GROUP BY city_id";
 
         $data = DB::select(DB::raw($sql));
         return response()->json([

app/Http/Controllers/V2/Dashboard/SafetyAndPrivacyController.php

@@ -134,7 +134,7 @@ class SafetyAndPrivacyController extends Controller
                     'activity_date_time' => $request->activity_date." ".$request->activity_time,
                     'edare_shahri_id' => auth()->user()->edarate_shahri_id,
                     'edare_shahri_name' => auth()->user()->edarate_shahri_name,
-                    'way_id' => $nominatimService->get_way_id_from_nominatim(),
+                    'way_id' => $nominatimService->get_way_id_from_nominatim($coordinates[0], $coordinates[1]),
                 ]);
 
                 if ($request->has('recognize_picture')) {

app/Http/Controllers/V3/ProfileController.php

@@ -9,6 +9,7 @@ use App\Http\Requests\V3\Profile\EditRequest;
 use App\Http\Traits\ApiResponse;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\File;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\Storage;
@@ -40,11 +41,13 @@ class ProfileController extends Controller
         if ($request->has('avatar'))
         {
             if ($user->avatar) {
-                FileFacade::delete($user->avatar);
+                File::delete($user->avatar);
             }
+
             $destinationPath = 'avatar/' . $user->username;
             $filename = time() .".". $request->file('avatar')->getClientOriginalExtension();
-            $avatar = FileFacade::save($request->avatar, $destinationPath, $filename);
+            $request->file('avatar')->storeAs($destinationPath, $filename, 'public');
+            $avatar = 'storage/'.$destinationPath ."/". $filename;
         }
 
         $user->update([

app/Models/User.php

@@ -13,6 +13,7 @@ use Spatie\Permission\Traits\HasPermissions;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use App\Models\UserActivityLog;
 use App\Models\LogList;
+use Illuminate\Support\Facades\URL;
 
 class User extends Authenticatable
 {
@@ -232,7 +233,8 @@ class User extends Authenticatable
 
     public function avatarUrl(): ?string
     {
+        
         $avatar = $this->attributes['avatar'];
-        return $avatar == null ? null : Storage::disk('public')->url($avatar);
+        return $avatar == null ? null : URL::to('/') . '/' . $avatar;
     }
 }

app/Providers/AppServiceProvider.php

@@ -25,5 +25,6 @@ class AppServiceProvider extends ServiceProvider
     public function boot()
     {
         Schema::defaultStringLength(191);
+        \URL::forceScheme('https');
     }
 }

database/migrations/2024_10_02_163352_add_columns_to_road_observation_histories_table.php

@@ -0,0 +1,30 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration {
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('road_observation_histories', function (Blueprint $table) {
+            $table->string('from_edareh')->nullable();
+            $table->string('to_edareh')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('road_observation_histories', function (Blueprint $table) {
+            $table->dropColumn('from_edareh');
+            $table->dropColumn('to_edareh');
+
+        });
+    }
+};

public/.gitignore

@@ -0,0 +1,8 @@
+*
+!.gitignore
+!.htaccess
+!favicon.ico  
+!index.php  
+!robots.txt  
+!vendor  
+!web.config

public/.htaccess

@@ -24,4 +24,4 @@
 </IfModule>
 <IfModule mod_deflate.c>
   AddOutputFilterByType DEFLATE application/json
-</IfModule>
+</IfModule>

public/asdasd.htaccess-bc

@@ -1,21 +0,0 @@
-<IfModule mod_rewrite.c>
-    <IfModule mod_negotiation.c>
-        Options -MultiViews -Indexes
-    </IfModule>
-
-    RewriteEngine On
-
-    # Handle Authorization Header
-    RewriteCond %{HTTP:Authorization} .
-    RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
-
-    # Redirect Trailing Slashes If Not A Folder...
-    RewriteCond %{REQUEST_FILENAME} !-d
-    RewriteCond %{REQUEST_URI} (.+)/$
-    RewriteRule ^ %1 [L,R=301]
-
-    # Handle Front Controller...
-    RewriteCond %{REQUEST_FILENAME} !-d
-    RewriteCond %{REQUEST_FILENAME} !-f
-    RewriteRule ^ index.php [L]
-</IfModule>

public/bi-assets/images/chart-icon/001-profits-2.svg

@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg fill="#164358" version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 368 368" style="enable-background:new 0 0 368 368;" xml:space="preserve">
-<g>
-	<g>
-		<g>
-			<path d="M360,352H16V8c0-4.416-3.576-8-8-8S0,3.584,0,8v352c0,4.416,3.576,8,8,8h352c4.424,0,8-3.584,8-8
-				C368,355.584,364.424,352,360,352z"/>
-			<path d="M72,304c2.048,0,4.096-0.784,5.656-2.344L288,91.312V168c0,4.416,3.576,8,8,8s8-3.584,8-8V72
-				c0-1.04-0.208-2.08-0.616-3.056c-0.808-1.96-2.368-3.52-4.328-4.328C298.08,64.216,297.04,64,296,64h-96c-4.424,0-8,3.584-8,8
-				s3.576,8,8,8h76.688L66.344,290.344c-3.128,3.128-3.128,8.184,0,11.312C67.904,303.216,69.952,304,72,304z"/>
-		</g>
-	</g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-</svg>

public/bi-assets/images/chart-icon/002-loss-2.svg

@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg fill="#164358" version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 368 368" style="enable-background:new 0 0 368 368;" xml:space="preserve">
-<g>
-	<g>
-		<g>
-			<path d="M360,352H16V8c0-4.416-3.576-8-8-8S0,3.584,0,8v352c0,4.416,3.576,8,8,8h352c4.424,0,8-3.584,8-8
-				C368,355.584,364.424,352,360,352z"/>
-			<path d="M68.944,303.384C69.92,303.784,70.96,304,72,304h96c4.424,0,8-3.584,8-8c0-4.416-3.576-8-8-8H91.312L301.656,77.656
-				c3.128-3.128,3.128-8.184,0-11.312s-8.184-3.128-11.312,0L80,276.688V200c0-4.416-3.576-8-8-8s-8,3.584-8,8v96
-				c0,1.04,0.216,2.08,0.616,3.056C65.424,301.016,66.984,302.576,68.944,303.384z"/>
-		</g>
-	</g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-</svg>

public/bi-assets/images/chart-icon/003-line-graph.svg

@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg fill="#164358" version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 368 368" style="enable-background:new 0 0 368 368;" xml:space="preserve">
-<g>
-	<g>
-		<g>
-			<path d="M360,352H16V8c0-4.416-3.584-8-8-8S0,3.584,0,8v352c0,4.416,3.584,8,8,8h352c4.424,0,8-3.584,8-8
-				C368,355.584,364.424,352,360,352z"/>
-			<path d="M88,240c22.056,0,40-17.944,40-40c0-6.88-1.84-13.544-5.112-19.392l52.592-45.04C182.376,140.984,190.96,144,200,144
-				c6.96,0,13.728-1.888,19.72-5.296l60.488,69.072C274.936,214.672,272,223.16,272,232c0,22.056,17.944,40,40,40
-				c22.056,0,40-17.944,40-40c0-22.056-17.944-40-40-40c-6.96,0-13.728,1.888-19.72,5.296l-60.488-69.072
-				C237.056,121.32,240,112.84,240,104c0-22.056-17.944-40-40-40c-22.056,0-40,17.944-40,40c0,6.856,1.832,13.504,5.12,19.384
-				l-52.6,45.04C105.624,163.016,97.04,160,88,160c-22.056,0-40,17.944-40,40C48,222.056,65.944,240,88,240z M296.224,213.944
-				c0,0,0.008,0,0.008-0.008C300.624,210.112,306.224,208,312,208c13.232,0,24,10.768,24,24s-10.768,24-24,24s-24-10.768-24-24
-				C288,225.072,290.992,218.496,296.224,213.944z M200,80c13.232,0,24,10.768,24,24c0,6.928-2.992,13.504-8.224,18.056
-				c0,0-0.008,0-0.008,0.008c-9.768,8.504-25.816,7.224-33.872-2.4c-0.016-0.024-0.032-0.04-0.056-0.064
-				c-0.016-0.016-0.032-0.032-0.04-0.056c-3.744-4.288-5.8-9.808-5.8-15.544C176,90.768,186.768,80,200,80z M88,176
-				c7.072,0,13.672,3.04,18.208,8.456C109.944,188.744,112,194.264,112,200c0,13.232-10.768,24-24,24s-24-10.768-24-24
-				S74.768,176,88,176z"/>
-		</g>
-	</g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-</svg>

public/bi-assets/images/chart-icon/004-line-chart-1.svg

@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg fill="#164358" version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 368 368" style="enable-background:new 0 0 368 368;" xml:space="preserve">
-<g>
-	<g>
-		<g>
-			<path d="M360,352H16V8c0-4.416-3.584-8-8-8S0,3.584,0,8v352c0,4.416,3.584,8,8,8h352c4.416,0,8-3.584,8-8
-				C368,355.584,364.416,352,360,352z"/>
-			<path d="M160,123.312V184c0,4.416,3.584,8,8,8h60.688l96,96H248c-4.416,0-8,3.584-8,8c0,4.416,3.584,8,8,8h96
-				c1.04,0,2.08-0.216,3.056-0.616c1.952-0.808,3.512-2.368,4.328-4.328c0.4-0.976,0.616-2.016,0.616-3.056v-96c0-4.416-3.584-8-8-8
-				c-4.416,0-8,3.584-8,8v76.688l-98.344-98.344C236.16,176.84,234.12,176,232,176h-56v-56c0-2.12-0.84-4.16-2.344-5.656l-96-96
-				c-3.128-3.128-8.184-3.128-11.312,0s-3.128,8.184,0,11.312L160,123.312z"/>
-		</g>
-	</g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-</svg>

public/bi-assets/images/chart-icon/005-line-chart.svg

@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg fill="#164358" version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 368 368" style="enable-background:new 0 0 368 368;" xml:space="preserve">
-<g>
-	<g>
-		<g>
-			<path d="M360,352H16V8c0-4.416-3.584-8-8-8S0,3.584,0,8v352c0,4.416,3.584,8,8,8h352c4.416,0,8-3.584,8-8
-				C368,355.584,364.416,352,360,352z"/>
-			<path d="M72,304c2.048,0,4.096-0.784,5.656-2.344L171.312,208H232c4.416,0,8-3.584,8-8v-60.688l96-96V120c0,4.416,3.584,8,8,8
-				c4.416,0,8-3.584,8-8V24c0-1.04-0.216-2.08-0.616-3.056c-0.808-1.952-2.368-3.512-4.328-4.328C346.08,16.216,345.04,16,344,16
-				h-96c-4.416,0-8,3.584-8,8s3.584,8,8,8h76.688l-98.344,98.344C224.84,131.84,224,133.88,224,136v56h-56
-				c-2.12,0-4.16,0.84-5.656,2.344l-96,96c-3.128,3.128-3.128,8.184,0,11.312C67.904,303.216,69.952,304,72,304z"/>
-		</g>
-	</g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-</svg>

public/bi-assets/images/chart-icon/006-loss-1.svg

@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg fill="#164358" version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 368.002 368.002" style="enable-background:new 0 0 368.002 368.002;" xml:space="preserve">
-<g>
-	<g>
-		<g>
-			<path d="M360,352.002h-8v-168c0-4.416-3.576-8-8-8h-64c-4.424,0-8,3.584-8,8v168h-32v-200c0-4.416-3.576-8-8-8h-64
-				c-4.424,0-8,3.584-8,8v200h-32v-232c0-4.416-3.576-8-8-8H56c-4.424,0-8,3.584-8,8v232H16v-344c0-4.416-3.576-8-8-8s-8,3.584-8,8
-				v352c0,4.416,3.576,8,8,8h48h64h48h64h48h64h16c4.424,0,8-3.584,8-8C368,355.586,364.424,352.002,360,352.002z M112,352.002H64
-				v-224h48V352.002z M224,352.002h-48v-192h48V352.002z M336,352.002h-48v-160h48V352.002z"/>
-			<path d="M260.944,111.386c0.976,0.4,2.016,0.616,3.056,0.616h80c4.424,0,8-3.584,8-8s-3.576-8-8-8h-60.688l82.344-82.344
-				c3.128-3.128,3.128-8.184,0-11.312s-8.184-3.128-11.312,0L272,84.69V24.002c0-4.416-3.576-8-8-8s-8,3.584-8,8v80
-				c0,1.04,0.216,2.08,0.616,3.056C257.424,109.018,258.984,110.578,260.944,111.386z"/>
-		</g>
-	</g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-</svg>

public/bi-assets/images/chart-icon/007-profits-1.svg

@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg fill="#164358" version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 368 368" style="enable-background:new 0 0 368 368;" xml:space="preserve">
-<g>
-	<g>
-		<g>
-			<path d="M360,352h-8V120c0-4.416-3.576-8-8-8h-64c-4.424,0-8,3.584-8,8v232h-32V152c0-4.416-3.576-8-8-8h-64
-				c-4.424,0-8,3.584-8,8v200h-32V184c0-4.416-3.576-8-8-8H56c-4.424,0-8,3.584-8,8v168H16V8c0-4.416-3.576-8-8-8S0,3.584,0,8v352
-				c0,4.416,3.576,8,8,8h48h64h48h64h48h64h16c4.424,0,8-3.584,8-8C368,355.584,364.424,352,360,352z M112,352H64V192h48V352z
-				 M224,352h-48V160h48V352z M336,352h-48V128h48V352z"/>
-			<path d="M56,112c2.048,0,4.096-0.784,5.656-2.344L144,27.312V88c0,4.416,3.576,8,8,8s8-3.584,8-8V8
-				c0-1.04-0.208-2.08-0.616-3.056c-0.808-1.96-2.368-3.52-4.328-4.328C154.08,0.216,153.04,0,152,0H72c-4.424,0-8,3.584-8,8
-				s3.576,8,8,8h60.688L50.344,98.344c-3.128,3.128-3.128,8.184,0,11.312C51.904,111.216,53.952,112,56,112z"/>
-		</g>
-	</g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-</svg>

public/bi-assets/images/chart-icon/008-bar-chart-6.svg

@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg fill="#164358" version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 368 368" style="enable-background:new 0 0 368 368;" xml:space="preserve">
-<g>
-	<g>
-		<path d="M360,352H16v-32h296c4.424,0,8-3.584,8-8v-64c0-4.416-3.576-8-8-8H16v-32h232c4.424,0,8-3.584,8-8v-64
-			c0-4.416-3.576-8-8-8H16V96h168c4.416,0,8-3.584,8-8V24c0-4.416-3.584-8-8-8H16V8c0-4.416-3.584-8-8-8S0,3.584,0,8v16v64v48v64v48
-			v64v48c0,4.416,3.584,8,8,8h352c4.424,0,8-3.584,8-8C368,355.584,364.424,352,360,352z M128,32h48v48h-48V32z M16,32h96v48H16V32z
-			 M192,144h48v48h-48V144z M16,144h160v48H16V144z M256,256h48v48h-48V256z M16,256h224v48H16V256z"/>
-	</g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-</svg>

public/bi-assets/images/chart-icon/009-pie-chart-4.svg

@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg fill="#164358" version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 368 368" style="enable-background:new 0 0 368 368;" xml:space="preserve">
-<g>
-	<g>
-		<path d="M314.376,54.304c-0.104-0.128-0.144-0.288-0.264-0.408s-0.28-0.16-0.408-0.272C280.416,20.504,234.56,0,184,0
-			C82.536,0,0,82.544,0,184s82.536,184,184,184c50.568,0,96.424-20.512,129.712-53.64c0.12-0.104,0.28-0.144,0.392-0.264
-			s0.152-0.272,0.264-0.392C347.496,280.416,368,234.56,368,184C368,133.448,347.496,87.592,314.376,54.304z M184,16
-			c43.44,0,82.96,16.72,112.816,43.88L180.688,176H16.408C20.624,87.088,94.064,16,184,16z M184,352
-			c-89.936,0-163.376-71.088-167.592-160h164.288l116.12,116.12C266.96,335.28,227.448,352,184,352z M308.128,296.808L195.32,184
-			L308.128,71.192C335.288,101.04,352,140.56,352,184S335.288,266.952,308.128,296.808z"/>
-	</g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-</svg>

public/bi-assets/images/chart-icon/010-pie-chart-3.svg

@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg fill="#164358" version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 368 368" style="enable-background:new 0 0 368 368;" xml:space="preserve">
-<g>
-	<g>
-		<path d="M184,0C82.536,0,0,82.544,0,184c0,50.552,20.496,96.4,53.608,129.688c0.112,0.128,0.152,0.296,0.28,0.424
-			c0.128,0.128,0.288,0.168,0.424,0.28C87.6,347.504,133.448,368,184,368c101.464,0,184-82.544,184-184S285.464,0,184,0z
-			 M192,16.408C278.24,20.496,347.504,89.76,351.592,176H192V16.408z M16,184C16,94.064,87.096,20.624,176,16.408v164.28
-			L59.872,296.816C32.72,266.96,16,227.44,16,184z M184,352c-43.44,0-82.96-16.712-112.816-43.872L187.312,192h164.28
-			C347.376,280.912,273.936,352,184,352z"/>
-	</g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-</svg>

public/bi-assets/images/chart-icon/011-pie-chart-2.svg

@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg fill="#164358" version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 368 368" style="enable-background:new 0 0 368 368;" xml:space="preserve">
-<g>
-	<g>
-		<path d="M184,0C82.544,0,0,82.544,0,184s82.544,184,184,184c50.56,0,96.416-20.504,129.704-53.624
-			c0.128-0.112,0.288-0.152,0.408-0.272s0.16-0.28,0.272-0.408C347.496,280.408,368,234.552,368,184C368,82.544,285.464,0,184,0z
-			 M256,184c0,39.696-32.296,72-72,72c-39.696,0-72-32.304-72-72s32.304-72,72-72C223.704,112,256,144.304,256,184z M176,16.408v80
-			c-42.144,3.824-75.776,37.448-79.592,79.592h-80C20.496,89.76,89.76,20.496,176,16.408z M184,352
-			c-89.936,0-163.376-71.088-167.592-160h80c4.056,44.784,41.768,80,87.592,80c21.384,0,41-7.688,56.272-20.416l56.544,56.544
-			C266.96,335.28,227.44,352,184,352z M308.128,296.808l-56.544-56.544C264.312,225,272,205.384,272,184
-			c0-45.824-35.216-83.536-80-87.592v-80C280.904,20.624,352,94.064,352,184C352,227.44,335.28,266.96,308.128,296.808z"/>
-	</g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-</svg>

public/bi-assets/images/chart-icon/012-presentation-1.svg

@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg fill="#164358" version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 368 368" style="enable-background:new 0 0 368 368;" xml:space="preserve">
-<g>
-	<g>
-		<path d="M344,32h-88V16c0-8.8-7.2-16-16-16H128c-8.8,0-16,7.2-16,16v16H24C10.8,32,0,42.8,0,56v224c0,13.2,10.8,24,24,24h120v48
-			h-24c-4.4,0-8,3.6-8,8c0,4.4,3.6,8,8,8h32h64h32c4.4,0,8-3.6,8-8c0-4.4-3.6-8-8-8h-24v-48h120c13.2,0,24-10.8,24-24V56
-			C368,42.8,357.2,32,344,32z M128,16h112v48H128V16z M208,352h-48v-48h48V352z M352,280c0,4.4-3.6,8-8,8H24c-4.4,0-8-3.6-8-8V56
-			c0-4.4,3.6-8,8-8h88v16c0,8.8,7.2,16,16,16h112c8.8,0,16-7.2,16-16V48h88c4.4,0,8,3.6,8,8V280z"/>
-	</g>
-</g>
-<g>
-	<g>
-		<path d="M232,127.7h-64c-4.4,0-8,3.6-8,8c0,4.4,3.6,8,8,8h45l-82,82c-3.1,3.1-3.1,8.2,0,11.3c1.6,1.6,3.6,2.3,5.7,2.3
-			s4.1-0.8,5.7-2.3l81.7-81.7v44.4c0,4.4,3.6,8,8,8c4.4,0,8-3.6,8-8v-64C240,131.2,236.4,127.7,232,127.7z"/>
-	</g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-</svg>

public/bi-assets/images/chart-icon/013-presentation.svg

@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg fill="#164358" version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 368 368" style="enable-background:new 0 0 368 368;" xml:space="preserve">
-<g>
-	<g>
-		<g>
-			<path d="M344,32h-88V16c0-8.824-7.176-16-16-16H128c-8.824,0-16,7.176-16,16v16H24C10.768,32,0,42.768,0,56v224
-				c0,13.232,10.768,24,24,24h120v48h-24c-4.424,0-8,3.584-8,8c0,4.416,3.576,8,8,8h32h64h32c4.424,0,8-3.584,8-8
-				c0-4.416-3.576-8-8-8h-24v-48h120c13.232,0,24-10.768,24-24V56C368,42.768,357.232,32,344,32z M128,16h112v48H128V16z M208,352
-				h-48v-48h48V352z M352,280c0,4.408-3.584,8-8,8H24c-4.416,0-8-3.592-8-8V56c0-4.408,3.584-8,8-8h88v16c0,8.824,7.176,16,16,16
-				h112c8.824,0,16-7.176,16-16V48h88c4.416,0,8,3.584,8,8V280z"/>
-			<path d="M226.344,130.344L144,212.688V168c0-4.416-3.576-8-8-8s-8,3.584-8,8v64c0,1.04,0.216,2.08,0.616,3.056
-				c0.808,1.96,2.368,3.52,4.328,4.328c0.976,0.4,2.016,0.616,3.056,0.616h64c4.416,0,8-3.584,8-8c0-4.416-3.576-8-8-8h-44.688
-				l82.344-82.344c3.128-3.128,3.128-8.184,0-11.312S229.472,127.216,226.344,130.344z"/>
-		</g>
-	</g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-</svg>

public/bi-assets/images/chart-icon/014-bar-chart-5.svg

@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg fill="#164358" version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 368 368" style="enable-background:new 0 0 368 368;" xml:space="preserve">
-<g>
-	<g>
-		<g>
-			<path d="M344,32h-88V16c0-8.824-7.176-16-16-16H128c-8.824,0-16,7.176-16,16v16H24c-6.408,0-12.44,2.496-16.968,7.032
-				C2.496,43.568,0,49.592,0,56c0,0,0,221.864,0,224c0,13.232,10.768,24,24,24h120v48h-24c-4.416,0-8,3.584-8,8c0,4.416,3.584,8,8,8
-				h32h64h32c4.424,0,8-3.584,8-8c0-4.416-3.576-8-8-8h-24v-48h120c13.232,0,24-10.768,24-24V56C368,42.768,357.232,32,344,32z
-				 M128,16h112v48H128V16z M208,352h-48v-48h48V352z M352,280c0,4.408-3.584,8-8,8H24c-4.408,0-8-3.592-8-8h-0.632
-				C16,273.992,16,263.456,16,245V55.992c0-2.136,0.832-4.136,2.336-5.648C19.848,48.832,21.856,48,24,48h88v16
-				c0,8.824,7.176,16,16,16h112c8.824,0,16-7.176,16-16V48h88c4.416,0,8,3.584,8,8V280z"/>
-			<path d="M312,240h-24V120c0-4.416-3.576-8-8-8s-8,3.584-8,8v120h-32V136c0-4.416-3.576-8-8-8s-8,3.584-8,8v104h-32v-88
-				c0-4.416-3.584-8-8-8c-4.416,0-8,3.584-8,8v88h-32v-72c0-4.416-3.584-8-8-8s-8,3.584-8,8v72H96v-48c0-4.416-3.584-8-8-8
-				s-8,3.584-8,8v48H56c-4.416,0-8,3.584-8,8c0,4.416,3.584,8,8,8h256c4.424,0,8-3.584,8-8C320,243.584,316.424,240,312,240z"/>
-		</g>
-	</g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-</svg>

public/bi-assets/images/chart-icon/015-hierarchical-structure-1.svg

@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg fill="#164358" version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 368 368" style="enable-background:new 0 0 368 368;" xml:space="preserve">
-<g>
-	<g>
-		<path d="M240,80h112c8.824,0,16-7.176,16-16V16c0-8.824-7.176-16-16-16H240c-8.824,0-16,7.176-16,16v16h-40c-4.416,0-8,3.584-8,8
-			v136h-32v-16c0-8.824-7.176-16-16-16H16c-8.824,0-16,7.176-16,16v48c0,8.824,7.176,16,16,16h112c8.824,0,16-7.176,16-16v-16h32
-			v136c0,4.416,3.584,8,8,8h40v16c0,8.824,7.176,16,16,16h112c8.824,0,16-7.176,16-16v-48c0-8.824-7.176-16-16-16H240
-			c-8.824,0-16,7.176-16,16v16h-32V192h32v16c0,8.824,7.176,16,16,16h112c8.824,0,16-7.176,16-16v-48c0-8.824-7.176-16-16-16H240
-			c-8.824,0-16,7.176-16,16v16h-32V48h32v16C224,72.824,231.176,80,240,80z M240,16l112-0.008V64H240V16z M128,208H16v-48l112-0.008
-			V208z M240,304l112-0.008V352H240V304z M240,160l112-0.008V208H240V160z"/>
-	</g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-</svg>

public/bi-assets/images/chart-icon/016-hierarchical-structure.svg

@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg fill="#164358" version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 368 368" style="enable-background:new 0 0 368 368;" xml:space="preserve">
-<g>
-	<g>
-		<path d="M352,256h-48v-72c0-4.416-3.584-8-8-8H192v-64h48c8.824,0,16-7.176,16-16V16c0-8.824-7.176-16-16-16H128
-			c-8.824,0-16,7.176-16,16v80c0,8.824,7.176,16,16,16h48v64H72c-4.416,0-8,3.584-8,8v72H16c-8.824,0-16,7.176-16,16v80
-			c0,8.824,7.176,16,16,16h112c8.824,0,16-7.176,16-16v-80c0-8.824-7.176-16-16-16H80v-64h208v64h-48c-8.824,0-16,7.176-16,16v80
-			c0,8.824,7.176,16,16,16h112c8.824,0,16-7.176,16-16v-80C368,263.176,360.824,256,352,256z M128,271.992V352H16v-80l55.952-0.008
-			c0.016,0,0.032,0.008,0.048,0.008s0.032-0.008,0.048-0.008H128z M128,96V16l112-0.008V96H128z M352,352H240v-80l55.952-0.008
-			c0.016,0,0.032,0.008,0.048,0.008s0.032-0.008,0.048-0.008H352V352z"/>
-	</g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-</svg>

public/bi-assets/images/chart-icon/017-pie-chart-1.svg

@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg fill="#164358" version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 368 368" style="enable-background:new 0 0 368 368;" xml:space="preserve">
-<g>
-	<g>
-		<g>
-			<path d="M184,0C82.544,0,0,82.544,0,184c0,4.416,3.584,8,8,8s8-3.584,8-8C16,91.36,91.36,16,184,16s168,75.36,168,168
-				s-75.36,168-168,168c-4.416,0-8,3.584-8,8c0,4.416,3.584,8,8,8c101.456,0,184-82.544,184-184S285.456,0,184,0z"/>
-			<path d="M304,184c0-4.416-3.584-8-8-8c-4.416,0-8,3.584-8,8c0,57.344-46.656,104-104,104S80,241.344,80,184S126.656,80,184,80
-				c4.416,0,8-3.584,8-8s-3.584-8-8-8c-66.168,0-120,53.832-120,120s53.832,120,120,120S304,250.168,304,184z"/>
-			<path d="M184,144c4.416,0,8-3.584,8-8s-3.584-8-8-8c-30.88,0-56,25.12-56,56s25.12,56,56,56s56-25.12,56-56c0-4.416-3.584-8-8-8
-				c-4.416,0-8,3.584-8,8c0,22.056-17.944,40-40,40c-22.056,0-40-17.944-40-40C144,161.944,161.944,144,184,144z"/>
-		</g>
-	</g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-</svg>

public/bi-assets/images/chart-icon/018-pie-chart.svg

@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg fill="#164358" version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 368 368" style="enable-background:new 0 0 368 368;" xml:space="preserve">
-<g>
-	<g>
-		<g>
-			<path d="M360,176h-64c-4.416,0-8,3.584-8,8c0,57.344-46.656,104-104,104S80,241.344,80,184S126.656,80,184,80
-				c4.416,0,8-3.584,8-8V8c0-4.416-3.584-8-8-8C82.544,0,0,82.544,0,184s82.544,184,184,184s184-82.544,184-184
-				C368,179.584,364.416,176,360,176z M184,352c-92.64,0-168-75.36-168-168C16,94.04,87.064,20.376,176,16.184v48.08
-				C113.552,68.4,64,120.52,64,184c0,66.168,53.832,120,120,120c63.48,0,115.6-49.552,119.736-112h48.08
-				C347.624,280.936,273.96,352,184,352z"/>
-			<path d="M128,184c0,30.88,25.12,56,56,56s56-25.12,56-56s-25.12-56-56-56S128,153.12,128,184z M224,184c0,22.056-17.944,40-40,40
-				c-22.056,0-40-17.944-40-40c0-22.056,17.944-40,40-40C206.056,144,224,161.944,224,184z"/>
-		</g>
-	</g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-</svg>

public/bi-assets/images/chart-icon/019-bar-chart-4.svg

@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg fill="#164358" version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 368 368" style="enable-background:new 0 0 368 368;" xml:space="preserve">
-<g>
-	<g>
-		<g>
-			<path d="M360,144H8c-4.416,0-8,3.584-8,8v64c0,4.416,3.584,8,8,8h352c4.416,0,8-3.584,8-8v-64C368,147.584,364.416,144,360,144z
-				 M352,208H16v-48h336V208z"/>
-			<path d="M8,96h224c4.416,0,8-3.584,8-8V24c0-4.416-3.584-8-8-8H8c-4.416,0-8,3.584-8,8v64C0,92.416,3.584,96,8,96z M16,32h208v48
-				H16V32z"/>
-			<path d="M296,272H8c-4.416,0-8,3.584-8,8v64c0,4.416,3.584,8,8,8h288c4.416,0,8-3.584,8-8v-64C304,275.584,300.416,272,296,272z
-				 M288,336H16v-48h272V336z"/>
-		</g>
-	</g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-</svg>

public/bi-assets/images/chart-icon/020-bar-chart-3.svg

@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg fill="#164358" version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 368 368" style="enable-background:new 0 0 368 368;" xml:space="preserve">
-<g>
-	<g>
-		<g>
-			<path d="M216,0h-64c-4.416,0-8,3.584-8,8v352c0,4.416,3.584,8,8,8h64c4.416,0,8-3.584,8-8V8C224,3.584,220.416,0,216,0z M208,352
-				h-48V16h48V352z"/>
-			<path d="M344,128h-64c-4.416,0-8,3.584-8,8v224c0,4.416,3.584,8,8,8h64c4.416,0,8-3.584,8-8V136C352,131.584,348.416,128,344,128
-				z M336,352h-48V144h48V352z"/>
-			<path d="M88,64H24c-4.416,0-8,3.584-8,8v288c0,4.416,3.584,8,8,8h64c4.416,0,8-3.584,8-8V72C96,67.584,92.416,64,88,64z M80,352
-				H32V80h48V352z"/>
-		</g>
-	</g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-</svg>

public/bi-assets/images/chart-icon/021-bar-chart-2.svg

@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg fill="#164358" version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 368 368" style="enable-background:new 0 0 368 368;" xml:space="preserve">
-<g>
-	<g>
-		<g>
-			<path d="M360,352h-8V168c0-4.416-3.576-8-8-8h-64c-4.424,0-8,3.584-8,8v184h-32V120c0-4.416-3.576-8-8-8h-64
-				c-4.424,0-8,3.584-8,8v232h-32V152c0-4.416-3.576-8-8-8H56c-4.424,0-8,3.584-8,8v200H16V8c0-4.416-3.576-8-8-8S0,3.584,0,8v352
-				c0,4.416,3.576,8,8,8h48h64h48h64h48h64h16c4.424,0,8-3.584,8-8C368,355.584,364.424,352,360,352z M112,352H64V160h48V352z
-				 M224,352h-48V128h48V352z M336,352h-48V176h48V352z"/>
-			<path d="M56,64h266.376l-39.584,33.928c-3.36,2.872-3.752,7.928-0.864,11.28c1.576,1.84,3.824,2.792,6.072,2.792
-				c1.84,0,3.696-0.632,5.2-1.928l56-48c0.072-0.064,0.096-0.16,0.168-0.224c0.592-0.544,1.032-1.208,1.44-1.904
-				c0.144-0.248,0.36-0.448,0.48-0.712C351.736,58.24,352,57.16,352,56c0-1.16-0.264-2.24-0.712-3.232
-				c-0.12-0.264-0.336-0.464-0.48-0.712c-0.408-0.696-0.848-1.36-1.44-1.904c-0.072-0.064-0.096-0.16-0.168-0.224l-56-48
-				c-3.344-2.864-8.4-2.488-11.272,0.864c-2.88,3.352-2.496,8.408,0.864,11.28L322.376,48H56c-4.424,0-8,3.584-8,8S51.576,64,56,64z
-				"/>
-		</g>
-	</g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-</svg>

public/bi-assets/images/chart-icon/022-bar-chart-1.svg

@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg fill="#164358" version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 368 368" style="enable-background:new 0 0 368 368;" xml:space="preserve">
-<g>
-	<g>
-		<path d="M360,352h-8V184c0-4.416-3.576-8-8-8h-64c-4.424,0-8,3.584-8,8v168h-32V56c0-4.416-3.576-8-8-8h-64c-4.424,0-8,3.584-8,8
-			v296h-32V248c0-4.416-3.576-8-8-8H56c-4.424,0-8,3.584-8,8v104H16V8c0-4.416-3.576-8-8-8S0,3.584,0,8v352c0,4.416,3.576,8,8,8h48
-			h64h48h64h48h64h16c4.424,0,8-3.584,8-8C368,355.584,364.424,352,360,352z M112,352H64v-96h48V352z M224,352h-48V64h48V352z
-			 M336,352h-48V192h48V352z"/>
-	</g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-</svg>

public/bi-assets/images/chart-icon/023-bar-chart.svg

@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg fill="#164358" version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 368 368" style="enable-background:new 0 0 368 368;" xml:space="preserve">
-<g>
-	<g>
-		<path d="M360,352h-8V184c0-4.416-3.576-8-8-8h-64c-4.424,0-8,3.584-8,8v168h-32V56c0-4.416-3.576-8-8-8h-64c-4.416,0-8,3.584-8,8
-			v296h-32V120c0-4.416-3.584-8-8-8H56c-4.416,0-8,3.584-8,8v232H16V8c0-4.416-3.584-8-8-8S0,3.584,0,8v352c0,4.416,3.584,8,8,8h48
-			h64h48h64h48h64h16c4.424,0,8-3.584,8-8C368,355.584,364.424,352,360,352z M112,352H64V128h48V352z M224,352h-48V64h48V352z
-			 M336,352h-48V192h48V352z"/>
-	</g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-</svg>

public/bi-assets/images/chart-icon/024-loss.svg

@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg fill="#164358" version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 368 368" style="enable-background:new 0 0 368 368;" xml:space="preserve">
-<g>
-	<g>
-		<path d="M360,352h-8V184c0-4.416-3.584-8-8-8h-64c-4.416,0-8,3.584-8,8v168h-32V120c0-4.416-3.584-8-8-8h-64c-4.416,0-8,3.584-8,8
-			v232h-32V56c0-4.416-3.584-8-8-8H56c-4.416,0-8,3.584-8,8v296H16V8c0-4.416-3.584-8-8-8S0,3.584,0,8v352c0,4.416,3.584,8,8,8h48
-			h64h48h64h48h64h16c4.416,0,8-3.584,8-8C368,355.584,364.416,352,360,352z M112,352H64V64h48V352z M224,352h-48V128h48V352z
-			 M336,352h-48V192h48V352z"/>
-	</g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-</svg>

public/bi-assets/images/chart-icon/025-profits.svg

@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg fill="#164358" version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 368 368" style="enable-background:new 0 0 368 368;" xml:space="preserve">
-<g>
-	<g>
-		<path d="M360,352h-8V56c0-4.416-3.584-8-8-8h-64c-4.416,0-8,3.584-8,8v296h-32V120c0-4.416-3.584-8-8-8h-64c-4.416,0-8,3.584-8,8
-			v232h-32V184c0-4.416-3.584-8-8-8H56c-4.416,0-8,3.584-8,8v168H16V8c0-4.416-3.584-8-8-8S0,3.584,0,8v352c0,4.416,3.584,8,8,8h48
-			h64h48h64h48h64h16c4.416,0,8-3.584,8-8C368,355.584,364.416,352,360,352z M112,352H64V192h48V352z M224,352h-48V128h48V352z
-			 M336,352h-48V64h48V352z"/>
-	</g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-</svg>

public/bi-assets/images/chart-icon/new/analytics.svg

@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg fill="#164358" version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 449.6 449.6" style="enable-background:new 0 0 449.6 449.6;" xml:space="preserve">
-<g>
-	<g>
-		<path d="M372.4,247.849H200.8v-171.2c0.1-5.4-4.2-9.9-9.7-10H191c-50.8-0.2-99.5,20-135.2,56c-36,36.7-55.8,84.7-55.8,135.2
-			c0,105.4,85.8,191.2,191.2,191.2c50.8,0.2,99.5-20,135.4-56c36-36.7,55.9-84.7,55.9-135.2
-			C382.4,252.349,377.9,247.849,372.4,247.849z M312.3,379.049c-32.1,32.2-75.7,50.2-121.1,50.1c-94.4-0.1-171.2-76.9-171.2-171.3
-			c0-45.4,17.9-88.9,49.9-121.1c29.6-29.7,69.1-47.5,110.9-49.8v170.9c0,5.5,4.9,10,10.4,10h170.9
-			C359.7,309.849,342.2,348.649,312.3,379.049z"/>
-	</g>
-</g>
-<g>
-	<g>
-		<path d="M393.7,56.649c0-0.1,0-0.1-0.1-0.2c-36.7-36-84.5-55.9-135-55.9c-5.4,0-9.8,4.4-9.8,9.9v0.1v181.3c-0.2,5.4,4,9.9,9.4,10
-			c0.1,0,0.1,0,0.2,0h181.2c5.5,0,10-4.5,10-10C449.6,141.349,429.8,93.249,393.7,56.649z M268.8,20.849c18.5,1.2,36.8,5.3,54,12.2
-			l-54,54V20.849z M268.8,115.349l73-73.2c10.9,6,21.1,13.2,30.4,21.4l-103.4,103.5V115.349z M282,181.849l104.1-104.1
-			c8.2,9.3,15.4,19.4,21.5,30.2l-73.9,73.9H282z M362,181.849l54.8-54.8c7.2,17.5,11.4,36,12.5,54.8H362z"/>
-	</g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-</svg>

public/bi-assets/images/chart-icon/new/bar-chart.svg

@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg fill="#164358" version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 429.655 429.655" style="enable-background:new 0 0 429.655 429.655;" xml:space="preserve">
-<g>
-	<g>
-		<path d="M418.407,40.127c-7.9-8.4-19-13.2-30.6-13.2c-23.1,0-41.8,18.7-41.8,41.8c0,3.7,0.5,7.4,1.5,11l-45.3,32.1
-			c-16.2-16.4-42.7-16.6-59.1-0.4c-11.6,11.5-15.5,28.6-9.9,44l-41.8,35.2c-13.2-18.9-39.2-23.6-58.2-10.4
-			c-7.2,5-12.6,12.2-15.5,20.4l-34.7-14.1c-3.9-22.8-25.4-38.1-48.2-34.2c-22.8,3.9-38.1,25.4-34.2,48.2
-			c3.9,22.8,25.4,38.1,48.2,34.2c15-2.5,27.4-13,32.5-27.3l34.7,14.1c3.9,22.8,25.4,38.1,48.2,34.2c20.1-3.4,34.8-20.8,34.8-41.2
-			c0-1.3-0.1-2.7-0.2-4l45.6-38.5c17.1,15.5,43.5,14.3,59-2.8c9.9-10.9,13.3-26.2,9.1-40.2l44.8-31.8c15.8,16.9,42.2,17.7,59.1,2
-			C433.307,83.427,434.107,57.027,418.407,40.127z M41.807,215.427c-12,0-21.8-9.8-21.8-21.8s9.8-21.8,21.8-21.8s21.8,9.8,21.8,21.8
-			C63.607,205.627,53.807,215.427,41.807,215.427z M157.107,236.427c-12,0-21.8-9.8-21.8-21.8s9.8-21.8,21.8-21.8
-			s21.8,9.8,21.8,21.8C178.907,226.627,169.207,236.427,157.107,236.427z M272.507,163.027c-12,0-21.8-9.8-21.8-21.8
-			s9.8-21.8,21.8-21.8s21.8,9.8,21.8,21.8S284.507,163.027,272.507,163.027z M387.807,90.527c-12,0-21.8-9.8-21.8-21.8
-			s9.8-21.8,21.8-21.8s21.8,9.8,21.8,21.8C409.607,80.827,399.907,90.527,387.807,90.527z"/>
-	</g>
-</g>
-<g>
-	<g>
-		<path d="M415.807,143.727h-56c-5.5,0-10,4.5-10,10v238c0,5.5,4.5,10,10,10h56c5.5,0,10-4.5,10-10v-238
-			C425.807,148.227,421.307,143.727,415.807,143.727z M405.807,382.727h-36v-219h36V382.727z"/>
-	</g>
-</g>
-<g>
-	<g>
-		<path d="M300.807,215.727h-56c-5.5,0-10,4.5-10,10v166c0,5.5,4.5,10,10,10h56c5.5,0,10-4.5,10-10v-166
-			C310.807,220.227,306.307,215.727,300.807,215.727z M290.807,382.727h-36v-147h36V382.727z"/>
-	</g>
-</g>
-<g>
-	<g>
-		<path d="M184.807,290.727h-56c-5.5,0-10,4.5-10,10v92c0,5.5,4.5,10,10,10h56c5.5,0,10-4.5,10-10v-92
-			C194.807,295.227,190.307,290.727,184.807,290.727z M174.807,382.727h-36v-72h36V382.727z"/>
-	</g>
-</g>
-<g>
-	<g>
-		<path d="M69.807,269.727h-56c-5.5,0-10,4.5-10,10v113c0,5.5,4.5,10,10,10h56c5.5,0,10-4.5,10-10v-113
-			C79.807,274.227,75.307,269.727,69.807,269.727z M59.807,382.727h-36v-93h36V382.727z"/>
-	</g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-</svg>

public/bi-assets/images/chart-icon/new/bar-chart_2.svg

@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg fill="#164358" version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 408 408" style="enable-background:new 0 0 408 408;" xml:space="preserve">
-<g>
-	<g>
-		<path d="M249,150h-89c-5.5,0-10,4.5-10,10v190c0,5.5,4.5,10,10,10h89c5.5,0,10-4.5,10-10V160C259,154.5,254.5,150,249,150z
-			 M238,340h-68V170h68V340z"/>
-	</g>
-</g>
-<g>
-	<g>
-		<path d="M398,48h-89c-5.5,0-10,4.5-10,10v292c0,5.5,4.5,10,10,10h89c5.5,0,10-4.5,10-10V58C408,52.5,403.5,48,398,48z M388,340
-			h-69V68h69V340z"/>
-	</g>
-</g>
-<g>
-	<g>
-		<path d="M99,220H10c-5.5,0-10,4.5-10,10v120c0,5.5,4.5,10,10,10h89c5.5,0,10-4.5,10-10V230C109,224.5,104.5,220,99,220z M89,340
-			H20V240h69V340z"/>
-	</g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-</svg>

public/bi-assets/images/chart-icon/new/diagram.svg

@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg fill="#164358" version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 462.602 462.602" style="enable-background:new 0 0 462.602 462.602;" xml:space="preserve">
-<g>
-	<g>
-		<path d="M462.179,208.602c-4.5-45.8-22.4-89.2-51.6-124.6c-3.5-4.3-9.8-4.9-14.1-1.4c-0.3,0.2-0.5,0.4-0.7,0.7l-82.7,83
-			c-3.3,3.4-3.9,8.6-1.3,12.5c6.6,10.4,11.3,22,13.8,34.1c1,4.6,5.1,8,9.8,7.9h116.9c5.5,0,10-4.5,10-10c0-0.1,0-0.1,0-0.2
-			C462.279,209.902,462.279,209.202,462.179,208.602z M343.279,200.802c-2.5-9-6-17.7-10.5-26l69.2-69.4
-			c20.7,28.1,34.2,60.9,39.1,95.4H343.279z"/>
-	</g>
-</g>
-<g>
-	<g>
-		<path d="M379.079,52.402c-0.2-0.2-0.5-0.4-0.7-0.6c-35.5-29.3-78.9-47.3-124.7-51.7c-0.7-0.1-1.3-0.1-2-0.1
-			c-5.5-0.1-10.1,4.3-10.2,9.8c0,0.1,0,0.1,0,0.2v116.9c0,5.3,4.2,9.7,9.5,10c11.8,2.4,23,7.1,33.1,13.6c4,2.6,9.2,2.1,12.6-1.3
-			l82.4-82.7C382.979,62.602,382.979,56.302,379.079,52.402z M287.979,129.502c-8.4-4.6-17.3-8.2-26.5-10.7v-97.6
-			c34.6,4.9,67.4,18.4,95.4,39.2L287.979,129.502z"/>
-	</g>
-</g>
-<g>
-	<g>
-		<path d="M207.479,0.502c-0.3,0-0.7,0-1,0.1c-108.5,10.8-195,98.8-205.7,209.2c-0.5,5.5,3.5,10.4,9,10.9c0.3,0.1,0.6,0.1,1,0.1
-			h116.9c4.7,0,8.8-3.3,9.8-8c7.8-37.6,36.8-68,72.1-75.7c4.6-1,7.9-5.1,7.9-9.8v-116.8C217.479,5.002,212.979,0.502,207.479,0.502z
-			 M197.479,119.602c-18.7,5.7-35.6,16.2-49,30.5c-13.6,14.3-23.4,31.7-28.7,50.7h-97.7c6.7-44.8,27.4-86.3,59-118.6
-			c31.3-32.1,72.1-53.3,116.4-60.4V119.602z"/>
-	</g>
-</g>
-<g>
-	<g>
-		<path d="M211.579,324.702c-0.1,0-0.2,0-0.2,0c-37.2-7.8-66.3-36.9-74.1-74.1c-1-4.6-5.1-7.9-9.8-7.8h-117.2
-			c-2.8-0.1-5.5,1.1-7.4,3.1c-1.9,2.1-2.8,4.9-2.5,7.7c10.6,109.5,97.7,196.9,207.1,207.8c0.3,0,0.7,0,1,0c5.5,0,10-4.4,10-9.9
-			c0,0,0.2-29.3,0.4-58.5c0.1-14.6,0.2-29.3,0.3-40.3c0-5.5,0.1-10.1,0.1-13.3c0-1.6,0-2.9,0-3.8
-			C219.279,327.702,214.379,325.402,211.579,324.702z M198.579,440.202c-91.4-14.3-162.9-86.1-177-177.5l98-0.2
-			c11,38.6,41.1,68.7,79.6,79.8C199.179,359.702,198.879,404.402,198.579,440.202z"/>
-	</g>
-</g>
-<g>
-	<g>
-		<path d="M453.179,245.002c-0.3-0.2-0.7-0.2-1-0.2h-117c-4.7,0-8.8,3.3-9.8,7.9c-3.9,17.9-13,34.3-26.2,47.2
-			c-13.2,13.1-29.9,22.1-48.2,25.9c-4.6,1-8,5-8,9.8l-0.5,117c0,5.5,4.4,10,9.9,10c0,0,0,0,0.1,0c0.4,0,0.8,0,1.2-0.1
-			c0.1,0,0.3,0,0.4,0c109.6-10.6,197.1-97.5,208-206.6C462.679,250.402,458.579,245.502,453.179,245.002z M262.679,441.202l0.1-23.6
-			l19.7,19.7C275.979,438.902,269.379,440.202,262.679,441.202z M304.079,430.702l-41.3-41.3l0.2-28.1l61,61
-			C317.479,425.402,310.879,428.302,304.079,430.702z M342.379,412.402l-71.5-71.5c6.7-2.4,13.1-5.4,19.3-9l69,69
-			C353.779,405.002,348.179,408.802,342.379,412.402z M374.579,388.002l-67.9-67.9c2.3-1.9,4.5-3.9,6.6-6c2.6-2.6,5.1-5.3,7.5-8.1
-			l67.9,67.9C384.179,378.802,379.479,383.502,374.579,388.002z M401.479,358.402l-69.1-69.1c3.6-6.2,6.5-12.7,8.9-19.4l71.6,71.6
-			C409.379,347.302,405.579,352.902,401.479,358.402z M422.879,323.202l-58.4-58.4h28.3l38.4,38.4
-			C428.779,310.002,425.979,316.702,422.879,323.202z M437.579,281.302l-16.5-16.5h19.8
-			C439.979,270.402,438.879,275.902,437.579,281.302z"/>
-	</g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-</svg>

public/bi-assets/images/chart-icon/new/diagram_2.svg

@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg fill="#164358" version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 503.2 503.2" style="enable-background:new 0 0 503.2 503.2;" xml:space="preserve">
-<g>
-	<g>
-		<path d="M150.5,284.2c-6.6-10.3-11.3-21.7-13.8-33.6c-1-4.6-5.1-8-9.8-7.9H10c-5.5,0-10,4.5-10,10c0,0.1,0,0.1,0,0.2
-			c0,0.5,0,1,0.1,1.5c4.4,45.7,22.4,89.1,51.6,124.5c1.8,2.2,4.4,3.5,7.2,3.6c0.2,0,0.3,0,0.5,0c2.7,0,5.2-1.1,7.1-2.9l82.7-82.7
-			C152.5,293.4,153.1,288.1,150.5,284.2z M60.3,357.3c-20.6-27.9-34.1-60.4-39.1-94.7H119c2.5,8.9,6,17.4,10.5,25.5L60.3,357.3z"/>
-	</g>
-</g>
-<g>
-	<g>
-		<path d="M211.2,325.6c-11.8-2.5-23-7.1-33-13.6c-4-2.6-9.2-2.1-12.6,1.3L83.1,396c-3.9,3.9-3.9,10.2,0,14.1
-			c0.2,0.2,0.5,0.4,0.7,0.6c35.4,29.2,78.8,47.1,124.5,51.6c0.7,0.1,1.3,0.1,2,0.1h0.2c5.5,0,10-4.5,10-10V335.6
-			C220.6,330.3,216.5,325.9,211.2,325.6z M200.6,441.2c-34.5-5-67.3-18.4-95.3-39.1l69-69.1c8.3,4.6,17.2,8.2,26.3,10.6V441.2z"/>
-	</g>
-</g>
-<g>
-	<g>
-		<path d="M461.9,208.7C451.3,99.4,364.2,12,254.8,1c-5.5-0.6-10.4,3.5-11,8.9c0,0.3,0,0.6,0,0.9c0,0-0.2,29.3-0.4,58.5
-			c-0.1,14.6-0.2,29.3-0.3,40.3c0,5.5-0.1,10.1-0.1,13.3c0,1.6,0,2.9,0,3.8c0,8.1,4.8,10.4,7.7,11c0.1,0,0.2,0,0.2,0
-			c37.2,7.8,66.3,36.9,74.1,74.1c1,4.6,5.1,7.8,9.8,7.7H452c2.8,0.1,5.5-1,7.4-3.1C461.3,214.3,462.2,211.5,461.9,208.7z M342.7,200
-			c-11-38.6-41.1-68.7-79.6-79.8c0-17.5,0.3-62.1,0.6-97.9c91.4,14.3,162.9,86.1,177,177.5L342.7,200z"/>
-	</g>
-</g>
-<g>
-	<g>
-		<path d="M209.8,0.4c-0.4,0-0.8,0-1.2,0.1c-0.1,0-0.3,0-0.4,0C98.5,11.5,11.6,98,0.2,207.6c-0.6,5.5,3.4,10.4,8.9,11
-			c0.3,0,0.7,0,1,0h117c4.7,0,8.8-3.3,9.8-7.9c7.9-36.4,37.8-66,74.3-73.5c4.6-1,8-5,8-9.8l0.5-117C219.7,4.9,215.3,0.4,209.8,0.4z
-			 M21.5,198.6c0.9-5.8,2-11.6,3.4-17.3l17.3,17.3H21.5z M70.4,198.6l-39-39c2.4-6.8,5.2-13.4,8.4-19.9l58.9,58.9H70.4z
-			 M121.3,192.8l-71.5-71.4c3.5-5.8,7.3-11.4,11.4-16.9l69,69C126.6,179.7,123.6,186.1,121.3,192.8z M148.9,149
-			c-2.5,2.5-4.9,5.1-7.1,7.8L74,89c2.3-2.6,4.7-5.1,7.2-7.6c2.3-2.2,4.6-4.4,6.9-6.6l67.8,67.8C153.5,144.6,151.2,146.8,148.9,149z
-			 M172.5,130.9L103.6,62c5.4-4.1,11-7.9,16.8-11.4l71.4,71.3C185.1,124.3,178.7,127.3,172.5,130.9z M199.3,101.2l-60.6-60.6
-			c6.5-3.1,13.1-6,19.9-8.4L199.4,73L199.3,101.2z M199.5,44.8l-19.3-19.3c6.4-1.6,12.9-2.9,19.4-3.8L199.5,44.8z"/>
-	</g>
-</g>
-<g>
-	<g>
-		<path d="M370.9,238.2c-72.9,0-132.3,59.3-132.3,132.3s59.3,132.3,132.3,132.3s132.3-59.3,132.3-132.3S443.9,238.2,370.9,238.2z
-			 M370.9,482.7c-62,0-112.3-50.3-112.3-112.3s50.3-112.3,112.3-112.3s112.3,50.3,112.3,112.3C483.1,432.4,432.9,482.7,370.9,482.7z
-			"/>
-	</g>
-</g>
-<g>
-	<g>
-		<path d="M443.6,359.6H426c-4.1-12-15-19.5-27.8-19.5s-23.7,7.5-27.8,19.5h-68.2c-5.5,0-10,4.5-10,10s4.5,10,10,10h68.2
-			c4.1,11,15,19.5,27.8,19.5c12.4-0.2,23.4-7.9,27.8-19.5h17.6c5.5,0,10-4.5,10-10S449.1,359.6,443.6,359.6z M398.2,378.8
-			c-5.3,0-9.5-4.3-9.5-9.5c0-5.3,4.3-9.5,9.5-9.5c5.3,0,9.5,4.3,9.5,9.5C407.7,374.5,403.5,378.8,398.2,378.8z"/>
-	</g>
-</g>
-<g>
-	<g>
-		<path d="M443.6,410.6h-68.2c-4.1-12-15-19.5-27.8-19.5s-23.7,7.5-27.8,19.5h-17.6c-5.5,0-10,4.5-10,10s4.5,10,10,10h17.6
-			c4.1,11,15,19.5,27.8,19.5c12.4-0.2,23.4-7.9,27.8-19.5h68.2c5.5,0,10-4.5,10-10S449.1,410.6,443.6,410.6z M347.6,429.6
-			c-5.3,0-9.5-4.3-9.5-9.5c0-5.3,4.3-9.5,9.5-9.5c5.3,0,9.5,4.3,9.5,9.5C357.1,425.4,352.8,429.6,347.6,429.6z"/>
-	</g>
-</g>
-<g>
-	<g>
-		<path d="M443.6,310.6h-68.2c-4.1-12-15-19.5-27.8-19.5s-23.7,7.5-27.8,19.5h-17.6c-5.5,0-10,4.5-10,10s4.5,10,10,10h17.6
-			c4.1,11,15,19.5,27.8,19.5c12.4-0.2,23.4-7.9,27.8-19.5h68.2c5.5,0,10-4.5,10-10S449.1,310.6,443.6,310.6z M347.6,329.8
-			c-5.3,0-9.5-4.3-9.5-9.5c0-5.3,4.3-9.5,9.5-9.5c5.3,0,9.5,4.3,9.5,9.5C357.1,325.5,352.8,329.7,347.6,329.8z"/>
-	</g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-</svg>

public/bi-assets/images/chart-icon/new/line-chart.svg

@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg fill="#164358" version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 481.844 481.844" style="enable-background:new 0 0 481.844 481.844;" xml:space="preserve">
-<g>
-	<g>
-		<path d="M453.4,368.972H60.1v-306.2c0-5.4-4.4-9.8-9.8-9.8c-0.1,0-0.1,0-0.2,0h-40c-5.5-0.1-10,4.3-10.1,9.7v0.1v336.3
-			c0.1,16.5,13.5,29.9,30,29.8h423.3c5.3,0.1,9.6-4.2,9.7-9.5c0-0.1,0-0.2,0-0.4v-40C463.1,373.572,459,368.972,453.4,368.972z
-			 M443.1,408.972H30.2c-5.5,0.1-10-4.3-10.1-9.8c0,0,0,0,0-0.1v-326.1h20v306.2c0,5.5,4.5,9.9,10,9.8h0.1h392.9V408.972z"/>
-	</g>
-</g>
-<g>
-	<g>
-		<path d="M457.5,123.972c-5.9-2.9-12.3-4.3-18.9-4.3c-23.8,0-43.2,19.3-43.2,43.1c0,9.5,3.1,18.7,8.8,26.2l-42.5,46.2
-			c-15.2-18.3-42.4-20.8-60.7-5.6c-1.2,1-2.3,2.1-3.4,3.2l-35.8-29.4c0-0.2,0-0.4,0-0.6c0-23.9-19.3-43.2-43.2-43.2
-			s-43.2,19.3-43.2,43.2c0,3.9,0.5,7.8,1.6,11.6l-39.6,49.5c-21.5-10.4-47.5-1.4-57.9,20.1c-10.4,21.5-1.4,47.5,20.1,57.9
-			c21.5,10.4,47.5,1.4,57.9-20.1c7.1-14.7,5.4-32.2-4.6-45.2l34.9-43.6c16.6,17.1,43.9,17.4,61,0.8c2.8-2.8,5.3-5.9,7.2-9.3
-			l31.4,25.7c-7,22.8,5.8,47,28.6,54c22.8,7,47-5.8,54-28.6c2.1-6.8,2.5-13.9,1.1-20.9l48.7-53c21.5,10.4,47.3,1.5,57.7-20
-			S479,134.372,457.5,123.972z M118.6,325.972c-12.8,0-23.2-10.4-23.2-23.2s10.4-23.2,23.2-23.2s23.2,10.4,23.2,23.2
-			C141.8,315.572,131.4,325.972,118.6,325.972z M218.6,225.972c-12.8,0-23.2-10.4-23.2-23.2s10.4-23.2,23.2-23.2
-			s23.2,10.4,23.2,23.2S231.4,225.972,218.6,225.972z M328.6,285.972c-12.8,0-23.2-10.4-23.2-23.2c0-12.8,10.4-23.2,23.2-23.2
-			s23.2,10.4,23.2,23.2S341.4,285.972,328.6,285.972z M438.6,185.972c-12.8,0-23.2-10.4-23.2-23.2s10.4-23.2,23.2-23.2
-			s23.2,10.4,23.2,23.2S451.4,185.972,438.6,185.972z"/>
-	</g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-</svg>

public/bi-assets/images/chart-icon/new/radar-chart-with-pentagon-shape.svg

@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg fill="#164358" version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="96.946px" height="96.946px" viewBox="0 0 96.946 96.946" style="enable-background:new 0 0 96.946 96.946;"
-	 xml:space="preserve">
-<g>
-	<path d="M48.473,2.372L0,37.591l18.515,56.984h59.917l18.515-56.984L48.473,2.372z M49.023,6.642L92.48,38.214l-11.082,2.488
-		c-0.352-0.85-1.188-1.451-2.166-1.451c-0.203,0-0.396,0.035-0.584,0.082L50.749,15.828c0.042-0.176,0.07-0.357,0.07-0.545
-		c0-1.105-0.767-2.025-1.796-2.273V6.642z M64.893,77.723l-37.174,4.783c-0.079-0.162-0.177-0.312-0.29-0.451l6.233-9.592
-		c0.235,0.078,0.483,0.131,0.745,0.131c1.296,0,2.347-1.051,2.347-2.346c0-0.002,0-0.004,0-0.004l19.603-4.85
-		c0.408,0.69,1.152,1.16,2.013,1.16c0.338,0,0.657-0.074,0.946-0.203l6.267,9.641c-0.429,0.426-0.694,1.014-0.694,1.664
-		C64.887,77.68,64.893,77.703,64.893,77.723z M34.354,44.817c-0.049-0.232-0.14-0.447-0.251-0.648l12.857-9.34
-		c0.275,0.232,0.6,0.406,0.962,0.494v12.531L34.354,44.817z M47.645,48.92L35.212,68.053c-0.139-0.051-0.283-0.088-0.433-0.113
-		l-1.927-20.438c0.708-0.256,1.252-0.838,1.458-1.568L47.645,48.92z M46.127,33.048c0,0.318,0.064,0.619,0.179,0.895l-12.947,9.408
-		c-0.372-0.248-0.818-0.395-1.298-0.395c-0.761,0-1.431,0.367-1.859,0.93l-10.725-2.4c-0.025-0.109-0.059-0.215-0.099-0.316
-		l28.167-23.732c0.121,0.051,0.248,0.088,0.377,0.121v13.217C46.894,31.022,46.127,31.942,46.127,33.048z M19.452,42.608l10.3,2.307
-		c-0.021,0.127-0.039,0.254-0.039,0.387c0,1.191,0.892,2.166,2.042,2.316l1.924,20.41c-0.938,0.307-1.621,1.18-1.621,2.221
-		c0,0.636,0.255,1.209,0.665,1.632l-6.172,9.497c-0.123-0.053-0.253-0.094-0.386-0.125l-7.472-37.453
-		C19.059,43.494,19.327,43.081,19.452,42.608z M57.768,61.949l-8.4-12.927l13.302-2.985c0.163,0.494,0.478,0.922,0.901,1.209
-		l-4.764,14.662c-0.143-0.026-0.289-0.045-0.438-0.045C58.158,61.863,57.96,61.897,57.768,61.949z M60.188,65.672
-		c0.324-0.402,0.525-0.908,0.525-1.465c0-0.748-0.355-1.406-0.9-1.836l4.793-14.75c0.093,0.012,0.185,0.027,0.281,0.027
-		c1.295,0,2.346-1.051,2.346-2.346c0-0.098-0.018-0.191-0.029-0.287L77.21,42.77c0.196,0.338,0.47,0.619,0.804,0.824L67.692,75.358
-		c-0.149-0.028-0.302-0.047-0.46-0.047c-0.247,0-0.48,0.05-0.704,0.119L60.188,65.672z M49.023,17.558
-		c0.131-0.033,0.258-0.07,0.379-0.121l27.652,23.297c-0.106,0.268-0.17,0.559-0.17,0.865c0,0.039,0.01,0.076,0.012,0.113
-		l-10.078,2.264c-0.422-0.613-1.131-1.018-1.932-1.018c-0.48,0-0.927,0.145-1.299,0.393l-12.947-9.408
-		c0.113-0.275,0.179-0.576,0.179-0.895c0-1.105-0.767-2.025-1.796-2.273V17.558L49.023,17.558z M49.023,35.324
-		c0.363-0.088,0.688-0.262,0.963-0.494l12.857,9.342c-0.129,0.232-0.222,0.484-0.267,0.758l-13.554,3.043V35.324L49.023,35.324z
-		 M56.797,62.477c-0.474,0.431-0.775,1.043-0.775,1.73c0,0.045,0.011,0.088,0.013,0.131l-19.552,4.838
-		c-0.096-0.186-0.213-0.356-0.354-0.512L48.473,49.67L56.797,62.477z M47.922,6.642v6.367c-1.028,0.248-1.795,1.168-1.795,2.273
-		c0,0.188,0.028,0.369,0.07,0.545L17.8,39.752c-0.194-0.053-0.395-0.09-0.606-0.09c-0.747,0-1.405,0.355-1.834,0.9L4.562,38.145
-		L47.922,6.642z M3.78,39.101l11.109,2.486c-0.025,0.137-0.042,0.277-0.042,0.422c0,1.109,0.771,2.033,1.805,2.277l7.47,37.441
-		c-0.518,0.43-0.855,1.07-0.855,1.797c0,0.688,0.3,1.299,0.77,1.729l-3.507,5.395L3.78,39.101z M21.326,91.447l3.68-5.664
-		c0.194,0.053,0.396,0.09,0.607,0.09c0.894,0,1.662-0.506,2.058-1.241l38.407-4.941c0.342,0.195,0.732,0.316,1.154,0.316
-		c0.3,0,0.584-0.062,0.848-0.164l7.541,11.604H21.326z M76.417,90.647l-7.435-11.438c0.367-0.416,0.596-0.952,0.596-1.551
-		c0-0.291-0.061-0.567-0.156-0.826l10.75-33.086c0.768-0.336,1.312-1.076,1.387-1.951l11.576-2.6L76.417,90.647z"/>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-</svg>

public/bi-assets/images/chart-icon/new/radar.svg

@@ -1 +0,0 @@
-<svg fill="#164358" id="Layer_1" height="512" viewBox="0 0 128 128" width="512" xmlns="http://www.w3.org/2000/svg" data-name="Layer 1"><path d="m123.173 60.98c-.007-.14-.022-.279-.03-.419-.05-.872-.112-1.741-.2-2.6 0-.022-.006-.044-.008-.066a58.8 58.8 0 0 0 -17.035-35.795 1.719 1.719 0 0 0 -.269-.221l-.013-.008a59.188 59.188 0 1 0 16.5 53.707 59.666 59.666 0 0 0 1.132-11.578q0-1.517-.077-3.02zm-36.16 38.533a4.249 4.249 0 1 1 0-6.011c.028.028.046.061.073.09v.007a4.249 4.249 0 0 1 -.073 5.914zm1.387-9.384a7.734 7.734 0 0 0 -12.06 7.421 35.749 35.749 0 1 1 -12.34-69.3 35.41 35.41 0 0 1 24 9.278l-8.144 8.144a24.023 24.023 0 0 0 -15.856-5.922c-.325 0-.641.013-.957.025a5.774 5.774 0 0 0 -11.092 3.19 24.249 24.249 0 1 0 33.387 32.581 24.156 24.156 0 0 0 2.45-6.783 25.27 25.27 0 0 0 .392-3.013h11.527a35.68 35.68 0 0 1 -4.254 15.274 35.778 35.778 0 0 1 -7.053 9.105zm-26.017-25.459a1.751 1.751 0 0 0 1.617 1.08h6.853a7.128 7.128 0 0 1 -4.9 5.068 7.093 7.093 0 1 1 1.662-12.908l-4.852 4.853a1.749 1.749 0 0 0 -.38 1.907zm7.753-9.28a10.573 10.573 0 1 0 4.315 10.36h10.214a21.63 21.63 0 0 1 -.311 2.335 20.756 20.756 0 0 1 -41.104-4.085 20.9 20.9 0 0 1 10.534-18.049 5.77 5.77 0 0 0 9.3-2.677c.3-.013.6-.024.918-.024a20.537 20.537 0 0 1 13.367 4.909zm-14.466-12.53-.012-.019a2.17 2.17 0 1 1 .012.019zm12.555 19.39 12.908-12.908 23.471-23.47a55.6 55.6 0 0 1 14.468 29.5c.024.155.045.311.068.467q.154 1.05.269 2.112.043.416.082.831.082.9.137 1.8c.02.34.04.679.054 1.019.009.216.01.434.017.651zm44.807 28.305a55.806 55.806 0 1 1 -10.9-67.165l-11.66 11.664a38.882 38.882 0 0 0 -26.472-10.304 39.25 39.25 0 1 0 13.574 76.074 7.745 7.745 0 0 0 13.183-8.11 39.041 39.041 0 0 0 12.45-26.964h16.5a55.138 55.138 0 0 1 -6.675 24.805z"/></svg>