Merge branch 'master' of https://github.com/devcode-it/openstamanager

ajax_dataload.php

@@ -154,6 +154,19 @@ if (!empty($query)) {
             if (preg_match('/^color_(.+?)$/', $field, $m)) {
                 $value = isset($r['color_title_'.$m[1]]) ? $r['color_title_'.$m[1]] : '';
 
+                // Formattazione automatica
+                if (!empty($total['format'][$pos]) && !empty($value)) {
+                    if (formatter()->isStandardTimestamp($value)) {
+                        $value = Translator::timestampToLocale($value);
+                    } elseif (formatter()->isStandardDate($value)) {
+                        $value = Translator::dateToLocale($value);
+                    } elseif (formatter()->isStandardTime($value)) {
+                        $value = Translator::timeToLocale($value);
+                    } elseif (formatter()->isStandardNumber($value)) {
+                        $value = Translator::numberToLocale($value);
+                    }
+                }
+
                 $column['class'] = 'text-center small';
                 $column['data-background'] = $r[$field];
             }

assets/src/css/style.css

@@ -1658,6 +1658,9 @@ body:not(.sidebar-collapse) .sidebar .nav-treeview .nav-treeview .nav-link {
     list-style: none;
 }
 
+.readmore{
+    overflow: hidden;
+}
 
 @media screen and (max-width: 767px) {
     .navbar-left {

assets/src/js/base/custom.js

@@ -98,6 +98,18 @@ $(document).ready(function () {
         });
     }, 1000);
 
+    // Plugin readmore.js
+    $('.readmore').each( function(){
+        height = $(this).data('height') ? parseInt($(this).data('height')) : 50;
+
+        $(this).readmore({
+            collapsedHeight: height,
+            moreLink: '<a href="#">' + globals.translations.readmore + '</a>',
+            lessLink: '<a href="#">' + globals.translations.readless + '</a>',
+            beforeToggle: function(){ setTimeout( 'alignMaxHeight(".module-header .card");', 300 ); },
+        });
+    });
+
     alignMaxHeight(".module-header .card");
 
     $("#main_loading").fadeOut()
@@ -130,6 +142,9 @@ function sendWhatsAppMessage(phoneNumber, message) {
 }
 
 function alignMaxHeight(element){
+    // Azzera l'altezza fissa
+    $(element).css('height', 'auto');
+    
     max_height = 0;
     $(element).each( function(){
         if($(this).height() > max_height){

gulpfile.js

@@ -127,6 +127,7 @@ const JS = gulp.parallel(() => {
         'leaflet.fullscreen/Control.FullScreen.js',
         'ismobilejs/dist/isMobile.min.js',
         'ua-parser-js/dist/ua-parser.min.js',
+        'readmore.js/readmore.js',
     ];
 
     for (const i in vendor) {

include/top.php

@@ -124,6 +124,8 @@ if (Auth::check()) {
         'singleCalendar' => tr("E' presente un solo periodo."),
         'noResults' => tr('Nessun elemento trovato'),
         'signatureMissing' => tr('Firma mancante.'),
+        'readmore' => tr('Mostra tutto'),
+        'readless' => tr('Mostra meno'),
     ];
     foreach ($translations as $key => $value) {
         echo '

mail.php

@@ -135,7 +135,7 @@ echo '
 
     <div class="row">
         <div class="col-md-8">
-            {[ "type": "text", "label": "'.tr('Oggetto').'", "name": "subject", "value": "'.$subject.'", "required": 1 ]}
+            {[ "type": "text", "label": "'.tr('Oggetto').'", "name": "subject", "value": "'.prepare($subject).'", "required": 1 ]}
         </div>
 
         <div class="col-md-4">

modules/interventi/header.php

@@ -172,9 +172,11 @@ echo '
 
                 <p><i class="fa '.(count($interventi_programmati) == 0 ? 'fa-clock-o text-success' : 'fa-clock-o text-warning').'"></i> '.(count($interventi_programmati) == 0 ? tr('Non sono presenti altre attività programmate') : 'Attività aperte:');
 if (count($interventi_programmati) != 0) {
+    echo ' <div class="readmore" data-height="50">';
     foreach ($interventi_programmati as $intervento_programmato) {
         echo ' <a class="btn btn-default btn-xs" href="'.base_path().'/editor.php?id_module='.$id_module.'&id_record='.$intervento_programmato->id.'" target="_blank">'.$intervento_programmato->codice.' ('.(new Carbon($intervento_programmato->data_richiesta))->diffForHumans().')</a>';
     }
+    echo ' </div>';
 }
 echo '
                 </p>';

package.json

@@ -42,6 +42,7 @@
         "pdfjs-viewer-element": "2.5.4",
         "popper.js": "^1.16.1",
         "pwstrength-bootstrap": "^3.0.4",
+        "readmore.js": "^2.0.4",
         "select2": "^4.0.3",
         "signature_pad": "^2.3.0",
         "smartwizard": "^4.2.2",