Search and file updates

v4.2.6

Classes/Controller/FrontController.php

@@ -235,7 +235,10 @@ class FrontController extends ActionController
 
         // Add custom JS
         $pageRenderer = GeneralUtility::makeInstance(PageRenderer::class);
-        $pageRenderer->loadRequireJsModule('TYPO3/CMS/LuNas/LuNas');
+        $pageRenderer->addJsFooterFile("EXT:lu_nas/Resources/Public/JavaScript/scripts.js");
+        // Add jQuery UI
+        $pageRenderer->addCssFile("EXT:lu_nas/Resources/Public/Css/jquery-ui.css");
+        $pageRenderer->addJsFooterFile("EXT:lu_nas/Resources/Public/JavaScript/jquery-ui.js");
 
         $syncResult = $this->frontendSession->pull('lu_nas_syn_result');
 
@@ -298,7 +301,13 @@ class FrontController extends ActionController
 
         // Get document files
         $fileLv = $this->getFileReferences($uid, 'filename_lv');
+        if ($fileLv) {
+            $fileLv = str_replace('fileadmin/lu_nas', 'uploads/lu_nas', 'fileadmin'.$fileLv[0]->getOriginalFile()->getIdentifier());
+        }
         $fileEn = $this->getFileReferences($uid, 'filename_en');
+        if ($fileEn) {
+            $fileEn = str_replace('fileadmin/lu_nas', 'uploads/lu_nas', 'fileadmin'.$fileEn[0]->getOriginalFile()->getIdentifier());
+        }
 
         // Assign data to view
         $this->view->assign('document', $document);

Resources/Private/Partials/Filter.html

@@ -45,14 +45,14 @@
 
                 <!-- Search by accepted date : start -->
                 <div class="form-group">
-                    <label for="accepted_date_till" class="col-xs-4 control-label">
+                    <label for="accepted_date_from" class="col-xs-4 control-label">
                         <f:translate key="form.acceptedDateFrom"/>
                     </label>
                     <div class="col-xs-8">
                         <div class="input-group">
-                            <f:form.textfield name="Filter[accepted_date_from]" value="{filter.accepted_date_from}" type="datetime" id="accepted_date_till" class="form-control t3js-datetimepicker t3js-clearable" data="{date-type:'date',date-offset:'0'}" />
+                            <f:form.textfield name="Filter[accepted_date_from]" value="{filter.accepted_date_from}" type="text" id="accepted_date_from" class="form-control t3js-datetimepicker t3js-clearable" data="{date-type:'date',date-offset:'0'}" additionalAttributes="{autocomplete='off', readonly='readonly'}" />
                             <span class="input-group-btn">
-                                <label class="btn btn-default" for="accepted_date_till">
+                                <label class="btn btn-default" for="accepted_date_from">
                                     <span class="fa fa-calendar"></span>
                                 </label>
                             </span>
@@ -67,7 +67,7 @@
                     </label>
                     <div class="col-xs-8">
                         <div class="input-group">
-                            <f:form.textfield name="Filter[accepted_date_till]" value="{filter.accepted_date_till}" type="datetime" id="accepted_date_till" class="form-control t3js-datetimepicker t3js-clearable" data="{date-type:'date',date-offset:'0'}" />
+                            <f:form.textfield name="Filter[accepted_date_till]" value="{filter.accepted_date_till}" type="text" id="accepted_date_till" class="form-control t3js-datetimepicker t3js-clearable" data="{date-type:'date',date-offset:'0'}" additionalAttributes="{autocomplete='off', readonly='readonly'}" />
                             <span class="input-group-btn">
                                 <label class="btn btn-default" for="accepted_date_till">
                                     <span class="fa fa-calendar"></span>
@@ -126,4 +126,4 @@
 
 </div>
 
-</html>
\ No newline at end of file
+</html>

Resources/Private/Templates/Front/Detail.html

@@ -54,18 +54,18 @@
         </f:if>
 
         <!-- LV File download -->
-        <f:if condition="{file_lv.0.originalFile.name}">
+        <f:if condition="{file_lv}">
         <tr>
             <td></td>
-            <td><a target="_blank" href="{upload_folder}{file_lv.0.originalFile.name}"><f:translate key="form.download" /></a></td>
+            <td><a target="_blank" href="{file_lv}"><f:translate key="form.download" /></a></td>
         </tr>
         </f:if>
 
         <!-- EN File download -->
-        <f:if condition="{file_en.0.originalFile.name}">
+        <f:if condition="{file_en}">
         <tr>
             <td></td>
-            <td><a target="_blank" href="{upload_folder}{file_en.0.originalFile.name}"><f:translate key="form.download" /></a></td>
+            <td><a target="_blank" href="{file_en}"><f:translate key="form.download" /></a></td>
         </tr>
         </f:if>
 

Resources/Public/JavaScript/scripts.js

+$(document).ready(function () {
+  $("#accepted_date_from").datepicker({
+    dateFormat: "yy-mm-dd"
+  });
+  $("#accepted_date_till").datepicker({
+    dateFormat: "yy-mm-dd"
+  });
+});

composer.json

 {
   "name": "luitd/lu-nas",
-  "version": "4.2.3",
+  "version": "4.2.6",
   "description": "Latvijas Universitātes Normatīvo Aktu sistēmas TYPO3 spraudnis",
   "type": "typo3-cms-extension",
   "keywords": [
@@ -16,7 +16,7 @@
   ],
   "license": "GPL-3.0-or-later",
   "require": {
-    "typo3/cms-core": "^9.5 || ^10",
+    "typo3/cms-core": "^10",
     "luitd/lu-api": "^2.7"
   },
   "autoload": {

ext_emconf.php

@@ -9,10 +9,10 @@ $EM_CONF[$_EXTKEY] = [
     'author_email'     => 'dainis.abols@lu.lv',
     'state'            => 'stable',
     'clearCacheOnLoad' => true,
-    'version'          => '4.2.3',
+    'version'          => '4.2.6',
     'constraints'      => [
         'depends' => [
-            'typo3'  => '9.5.0-10.9.99',
+            'typo3'  => '10.4.0-10.9.99',
             'lu_api' => '2.7.0-2.99.99',
         ],
     ],

readme.md

@@ -4,7 +4,7 @@ TYPO3 Extension for Regulations (NAS)
 
 ## Version
 
-4.2.3
+4.2.6
 
 ## Dependecies