Merge branch 'master' of https://github.com/acdh-oeaw/arche-dashboard

acdh-oeaw · Feb 6, 2023 · ec6394e · ec6394e
2 parents 2c7ea3c + 1315079
commit ec6394e
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 17 deletions.
diff --git a/src/Controller/DashboardController.php b/src/Controller/DashboardController.php
@@ -338,7 +338,6 @@ public function getValuesByProperty(): array
      */
     public function getValuesByPropertyApi(string $property): Response
     {
-
         $offset = (empty($_POST['start'])) ? 0 : $_POST['start'];
         $limit = (empty($_POST['length'])) ? 10 : $_POST['length'];
         $draw = (empty($_POST['draw'])) ? 0 : $_POST['draw'];
@@ -373,8 +372,8 @@ public function getValuesByPropertyApi(string $property): Response
      * @param string $params
      * @return array
      */
-    public function getValuesByPropertyDetail(string $params): array {
-       
+    public function getValuesByPropertyDetail(string $params): array
+    {
         $params = str_replace(':', '/', $params);
         $params = str_replace('//', '://', $params);
 
@@ -397,7 +396,6 @@ public function getValuesByPropertyDetail(string $params): array {
      */
     public function getValuesByPropertyDetailApi(string $params): Response
     {
-
         $offset = (empty($_POST['start'])) ? 0 : $_POST['start'];
         $limit = (empty($_POST['length'])) ? 10 : $_POST['length'];
         $draw = (empty($_POST['draw'])) ? 0 : $_POST['draw'];

diff --git a/src/Helper/DashboardHelper.php b/src/Helper/DashboardHelper.php
@@ -139,7 +139,8 @@ public function addUrlToTableData(array $data, string $key = "properties"): arra
      * Get the cached query files path
      * @return type
      */
-    public function getCachedFilePath() {
+    public function getCachedFilePath()
+    {
         $extension_list = \Drupal::service('extension.list.module');
         return $extension_list->getPath('arche_dashboard') . '/cache/';
     }
@@ -164,33 +165,33 @@ private function formatNumberToGuiFriendlyFormat(int $size): string
      * @param string $params
      * @return array
      */
-    public function processValuesByPropApiParamaters(string $params): array {
+    public function processValuesByPropApiParamaters(string $params): array
+    {
         $result = [];
         $params = explode("&", $params);
         $property = str_replace(':', '/', $params[0]);
         $result['property'] = str_replace('//', '://', $property);
         $rdf = str_replace(':', '/', $params[1]);
         $result['rdf'] = str_replace('//', '://', $rdf);
 
-        if(isset($params[2])) {
+        if (isset($params[2])) {
             $kw = str_replace(':', '/', $params[2]);
             $result['keyword'] = str_replace('//', '://', $kw);
         }
         return $result;
     }
 
-    public function dashboardValuesByPropertyTableFormat(array &$data, string $prop, array $rdf): array {
+    public function dashboardValuesByPropertyTableFormat(array &$data, string $prop, array $rdf): array
+    {
         $prop = str_replace("#", "%23", $prop);
         $rdf = implode("?", $rdf);
         $rdf = str_replace("#", "%23", $rdf);
 
         for ($x = 0; $x <= count($data); $x++) {
-            if(isset($data[$x]->count)) {
-
-
+            if (isset($data[$x]->count)) {
                 $data[$x]->count = '<a href="/browser/dashboard-vbp-detail/'.$prop.'&'.$rdf.'&'.str_replace("#", "%23", $data[$x]->key).'" >'.$data[$x]->count.'</a>';
             }
-        } 
+        }
 
         return $data;
     }

diff --git a/src/Model/DashboardModel.php b/src/Model/DashboardModel.php
@@ -304,7 +304,7 @@ public function getValuesByPropertyApiData(string $property, array $types, int $
                     ':offset' => $offset,
                     ':search' => $search
                 ),
-                    ['allow_delimiter_in_query' => true, 'allow_square_brackets' => true]
+                ['allow_delimiter_in_query' => true, 'allow_square_brackets' => true]
             );
             $return = $query->fetchAll();
 
@@ -325,7 +325,8 @@ public function changeBackDBConnection()
     }
 
 
-    private function formatTypeArray(array $types): string {
+    private function formatTypeArray(array $types): string
+    {
         $typeStr = 'ARRAY [ ';
         $count = count($types);
         $i = 0;
@@ -338,7 +339,7 @@ private function formatTypeArray(array $types): string {
             }
             $i++;
         }
-        return $typeStr;        
+        return $typeStr;
     }
 
     /**
@@ -368,7 +369,6 @@ public function getDBLastModificationDate(): string
 
     public function getValuesByPropertyDetailData(array $params, int $offset, int $limit, string $search = "", int $orderby = 1, string $order = 'asc'): array
     {
-
         try {
             $query = $this->repodb->query(
                 "WITH query_data as (
@@ -396,7 +396,7 @@ public function getValuesByPropertyDetailData(array $params, int $offset, int $l
                     ':offset' => $offset,
                     ':search' => $search
                 ),
-                    ['allow_delimiter_in_query' => true, 'allow_square_brackets' => true]
+                ['allow_delimiter_in_query' => true, 'allow_square_brackets' => true]
             );
             $return = $query->fetchAll();
             $this->changeBackDBConnection();