Now we can set a custom icon for a document format.

NeoRazorX · Oct 7, 2019 · b65e885 · b65e885
1 parent d4fbdd5
commit b65e885
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 3 deletions.
diff --git a/Core/Controller/ListFormatoDocumento.php b/Core/Controller/ListFormatoDocumento.php
@@ -51,7 +51,7 @@ protected function createFormatView($viewName = 'ListFormatoDocumento')
     {
         $this->addView($viewName, 'FormatoDocumento', 'printing-formats', 'fas fa-print');
         $this->addSearchFields($viewName, ['titulo', 'texto']);
-        $this->addOrderBy($viewName, ['id'], 'id');
+        $this->addOrderBy($viewName, ['tipodoc', 'id'], 'id');
         $this->addOrderBy($viewName, ['titulo'], 'title');
 
         /// Filters

diff --git a/Core/Lib/PDF/PDFDocument.php b/Core/Lib/PDF/PDFDocument.php
@@ -397,7 +397,8 @@ protected function insertHeader($idempresa = null)
             $lineText = $company->cifnif . ' - ' . $address . "\n" . $contactData;
             $this->pdf->ezText($lineText, self::FONT_SIZE, ['justification' => 'right']);
 
-            $this->insertCompanyLogo($company->idlogo);
+            $idlogo = $this->format->idlogo ?? $company->idlogo;
+            $this->insertCompanyLogo($idlogo);
         }
     }
 }
diff --git a/Core/Model/FormatoDocumento.php b/Core/Model/FormatoDocumento.php
@@ -50,6 +50,12 @@ class FormatoDocumento extends Base\ModelClass
      */
     public $idempresa;
 
+    /**
+     *
+     * @var int
+     */
+    public $idlogo;
+
     /**
      * 
      *

diff --git a/Core/Table/formatos_documentos.xml b/Core/Table/formatos_documentos.xml
@@ -19,6 +19,10 @@
         <name>idempresa</name>
         <type>integer</type>
     </column>
+    <column>
+        <name>idlogo</name>
+        <type>integer</type>
+    </column>
     <column>
         <name>texto</name>
         <type>text</type>
@@ -43,4 +47,8 @@
         <name>ca_formatos_documentos_empresas</name>
         <type>FOREIGN KEY (idempresa) REFERENCES empresas (idempresa) ON DELETE CASCADE ON UPDATE CASCADE</type>
     </constraint>
+    <constraint>
+        <name>ca_formatos_documentos_attached_files</name>
+        <type>FOREIGN KEY (idlogo) REFERENCES attached_files (idfile) ON DELETE SET NULL ON UPDATE CASCADE</type>
+    </constraint>
 </table>
diff --git a/Core/XMLView/EditFormatoDocumento.xml b/Core/XMLView/EditFormatoDocumento.xml
@@ -50,7 +50,12 @@
             <column name="title" order="140" >
                 <widget type="text" fieldname="titulo" />
             </column>
-            <column name="additional-text" numcolumns="12" order="150">
+            <column name="logo" titleurl="ListAttachedFile" order="150">
+                <widget type="select" fieldname="idlogo" onclick="EditAttachedFile">
+                    <values source="attached_files" fieldcode="idfile" fieldtitle="filename"></values>
+                </widget>
+            </column>
+            <column name="additional-text" numcolumns="12" order="160">
                 <widget type="textarea" fieldname="texto" />
             </column>
         </group>