changes on petition form (more to come)

3 files changed, 18 insertions, 14 deletions

diff --git a/public/app/views/js/pdf-designer/penalty.php b/public/app/views/js/pdf-designer/penalty.php
index 1b8b5ea..f2f3029 100644
--- a/public/app/views/js/pdf-designer/penalty.php
+++ b/public/app/views/js/pdf-designer/penalty.php
@@ -48,16 +48,14 @@ function designer(data, defines) {
                         style: 'bigger',
                         text: 'ΘΕΜΑ: '
                     },
-                    'Πειθαρχική υπόθεση '+ data.of_article,
-                    ' '+ data.student_names +', ',
-                    'του τμήματος ' + data.of_department + '\n',
+                    data.subject + '\n',
 
                     {
                         style: 'bigger',
                         text: 'ΗΜΕΡΑ: '
                     },
                     elDate,
-                    ', Ωρα'+ data.time + '\n',
+                    ', Ωρα '+ data.time + '\n',
 
                     {
                         style: 'bigger',
@@ -125,15 +123,13 @@ function designer(data, defines) {
                 ]
             },
             {
-                alignment: 'center',
-                style: 'bigger',
-                text: 'Το Πειθαρχικό Συμβούλιο αποφασίζει'
-            },
-            {
                 alignment: 'left',
-                text: data.decision
+                style: 'bigger',
+                text: [
+                    'Το Πειθαρχικό Συμβούλιο του σχολείου ΑΠΟΦΑΣΙΖΕΙ ',
+                    data.decision
+                ]
             },
-
             {
                 columns: [
                     {
diff --git a/public/app/views/js/submit/penalty-form.php b/public/app/views/js/submit/penalty-form.php
index e3d2748..f2d57c7 100644
--- a/public/app/views/js/submit/penalty-form.php
+++ b/public/app/views/js/submit/penalty-form.php
@@ -5,12 +5,20 @@
         ////////////////////////////////////////////////////////////////////////
 
         function postObject() {
+            let deps = selected_multitexts($('select[name="of_department[]"]'));
+            console.log(deps);
             return {        // select content data
                 type_id: 2,     // 1 = penalty document
-                subject: $('input[name=subject]').val(),
+                subject: [
+                    'Πειθαρχική υπόθεση',
+                    selected_text($('select[name=of_article]')),
+                    $('textarea[name=student_names]').val() + ',',
+                    ((deps.length > 1) ? 'των τμημάτων' : 'του τμήματος'),
+                    deps.join(', ')
+                ].join(' '),
                 of_article: selected_text($('select[name=of_article]')),
                 student_names: $('textarea[name=student_names]').val(),
-                of_department: $('input[name=of_department]').val(),
+                of_department: deps.join(', '),
                 date: $('input[name=date]').val(),
                 time: $('input[name=time]').val(),
                 place: selected_text($('select[name=place]')),
diff --git a/public/app/views/templates/penalty.php b/public/app/views/templates/penalty.php
index a033925..88044fb 100644
--- a/public/app/views/templates/penalty.php
+++ b/public/app/views/templates/penalty.php
@@ -21,7 +21,7 @@
               <div>
 
                 <h4>
-                    Πρακτικό Πειθαρχικής Υπόθεσης
+                    Καταγραφή Ενέργειας Υποστήριξης Εύρυθμης Λειτουργίας
                     <button class="btn btn-back2panel btn-sm">
                         Επιστροφή
                     </button>