Rev: 4508

20 files changed, 95 insertions, 27 deletions

diff --git a/mayor-orig/mayor-base/log/mayor-base.rev b/mayor-orig/mayor-base/log/mayor-base.rev
index 1d0d39c1..7553ea5e 100644
--- a/mayor-orig/mayor-base/log/mayor-base.rev
+++ b/mayor-orig/mayor-base/log/mayor-base.rev
@@ -1 +1 @@
-4506
+4508
diff --git a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
index 1d0d39c1..7553ea5e 100644
--- a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
+++ b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
@@ -1 +1 @@
-4506
+4508
diff --git a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
index 1d0d39c1..7553ea5e 100644
--- a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
+++ b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
@@ -1 +1 @@
-4506
+4508
diff --git a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
index 1d0d39c1..7553ea5e 100644
--- a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
+++ b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
@@ -1 +1 @@
-4506
+4508
diff --git a/mayor-orig/mayor-installer-sulix/log/mayor-installer-sulix.rev b/mayor-orig/mayor-installer-sulix/log/mayor-installer-sulix.rev
index 1d0d39c1..7553ea5e 100644
--- a/mayor-orig/mayor-installer-sulix/log/mayor-installer-sulix.rev
+++ b/mayor-orig/mayor-installer-sulix/log/mayor-installer-sulix.rev
@@ -1 +1 @@
-4506
+4508
diff --git a/mayor-orig/mayor-jatek/log/mayor-jatek.rev b/mayor-orig/mayor-jatek/log/mayor-jatek.rev
index 1d0d39c1..7553ea5e 100644
--- a/mayor-orig/mayor-jatek/log/mayor-jatek.rev
+++ b/mayor-orig/mayor-jatek/log/mayor-jatek.rev
@@ -1 +1 @@
-4506
+4508
diff --git a/mayor-orig/mayor-locales-de_DE/log/mayor-locales-de_DE.rev b/mayor-orig/mayor-locales-de_DE/log/mayor-locales-de_DE.rev
index 1d0d39c1..7553ea5e 100644
--- a/mayor-orig/mayor-locales-de_DE/log/mayor-locales-de_DE.rev
+++ b/mayor-orig/mayor-locales-de_DE/log/mayor-locales-de_DE.rev
@@ -1 +1 @@
-4506
+4508
diff --git a/mayor-orig/mayor-locales-en_US/log/mayor-locales-en_US.rev b/mayor-orig/mayor-locales-en_US/log/mayor-locales-en_US.rev
index 1d0d39c1..7553ea5e 100644
--- a/mayor-orig/mayor-locales-en_US/log/mayor-locales-en_US.rev
+++ b/mayor-orig/mayor-locales-en_US/log/mayor-locales-en_US.rev
@@ -1 +1 @@
-4506
+4508
diff --git a/mayor-orig/mayor-locales-jp_JP/log/mayor-locales-jp_JP.rev b/mayor-orig/mayor-locales-jp_JP/log/mayor-locales-jp_JP.rev
index 1d0d39c1..7553ea5e 100644
--- a/mayor-orig/mayor-locales-jp_JP/log/mayor-locales-jp_JP.rev
+++ b/mayor-orig/mayor-locales-jp_JP/log/mayor-locales-jp_JP.rev
@@ -1 +1 @@
-4506
+4508
diff --git a/mayor-orig/mayor-naplo/log/mayor-naplo.rev b/mayor-orig/mayor-naplo/log/mayor-naplo.rev
index 1d0d39c1..7553ea5e 100644
--- a/mayor-orig/mayor-naplo/log/mayor-naplo.rev
+++ b/mayor-orig/mayor-naplo/log/mayor-naplo.rev
@@ -1 +1 @@
-4506
+4508
diff --git a/mayor-orig/mayor-naplo/update/pre004506-1.sh b/mayor-orig/mayor-naplo/update/pre004506-1.sh
new file mode 100644
index 00000000..254d141d
--- /dev/null
+++ b/mayor-orig/mayor-naplo/update/pre004506-1.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+DIR="$BASEDIR/download/private/naplo/haladasi/haladasi"
+mkdir -p $DIR
+chown -R www-data $DIR
+
+echo " Kész."
+
+
diff --git a/mayor-orig/mayor-naplo/www/include/modules/naplo/haladasi/haladasi.php b/mayor-orig/mayor-naplo/www/include/modules/naplo/haladasi/haladasi.php
index 391ef7c8..7b890fad 100644
--- a/mayor-orig/mayor-naplo/www/include/modules/naplo/haladasi/haladasi.php
+++ b/mayor-orig/mayor-naplo/www/include/modules/naplo/haladasi/haladasi.php
@@ -152,4 +152,21 @@
 	return $RESULT;
     }
 
+    function exportTankorHaladasi($file, $ADAT) {
+
+
+	$EXPORT = array(array('Óraszám','Téma'));
+	foreach ($ADAT['haladasi'] as $dt => $nAdat) {
+	    foreach ($nAdat as $index => $oAdat) {
+		if ($oAdat['oraszam'] != '')
+		    $EXPORT[] = array($oAdat['oraszam'], $oAdat['leiras']);
+	    }
+	}
+	if ($ADAT['formatum'] == 'xml') return generateXLS("$file.${ADAT['formatum']}", $EXPORT, 'haladási napló');
+        elseif ($ADAT['formatum'] == 'csv') return generateCSV("$file.${ADAT['formatum']}", $EXPORT, 'haladási napló');
+        elseif ($ADAT['formatum'] == 'ods') return generateODS("$file.${ADAT['formatum']}", $EXPORT, 'haladási naplo');
+        else return false;
+
+    }
+
 ?>
diff --git a/mayor-orig/mayor-naplo/www/policy/private/naplo/haladasi/haladasi-pre.php b/mayor-orig/mayor-naplo/www/policy/private/naplo/haladasi/haladasi-pre.php
index f6a59939..460e4ec9 100644
--- a/mayor-orig/mayor-naplo/www/policy/private/naplo/haladasi/haladasi-pre.php
+++ b/mayor-orig/mayor-naplo/www/policy/private/naplo/haladasi/haladasi-pre.php
@@ -17,6 +17,7 @@
     require_once('include/modules/naplo/share/tanmenet.php');
     require_once('include/modules/naplo/share/hetes.php');
     require_once('include/modules/naplo/share/helyettesitesModifier.php');
+    require_once('include/modules/naplo/share/file.php');
     require_once('include/share/date/names.php');
 
 
@@ -247,6 +248,16 @@ if ( $skin == 'ajax'
 //	    for ($i=0; $i<count($_NAPOK); $i++) {
 //		checkNaplo($_NAPOK[$i]);
 //	    }
+	} elseif ($action == 'haladasiExport') {
+	    $ADAT['formatum'] = readVariable($_POST['formatum'], 'enum', 'ods', array('csv','ods','xml'));
+	    $orderBy = array('dt','ora');
+	    if ($ADAT['formatum'] == 'xml') $ADAT['mime'] = 'application/vnd.ms-excel';
+	    $file = $tankorId;
+	    $Tankorok = getTankorById($tankorId, __TANEV); // felül kell írnunk
+    	    $ADAT['haladasi'] = getHaladasi($Tankorok, $ADAT['munkaterv'], $orderBy, $csakUres);
+	    if (exportTankorHaladasi($file, $ADAT))
+        	header('Location: '.location('index.php?page=session&f=download&download=true&dir=naplo/haladasi/haladasi&file='.$file.'.'.$ADAT['formatum'].'&mimetype='.$ADAT['mime']));
+
 	}
     }
 
diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/haladasi/haladasi.css b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/haladasi/haladasi.css
index 4eae0808..f3899611 100644
--- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/haladasi/haladasi.css
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/haladasi/haladasi.css
@@ -295,6 +295,18 @@
     table.haladasiBejegyzesek tbody tr td.ora a.tankorStat {display:none;}
     table.haladasiBejegyzesek tbody tr:hover td.ora a.tankorStat { display:inline;}
 
+    form.exportForm { text-align: right; width:95%; }
+    form.exportForm input{
+	cursor: pointer;
+	border: solid 1px #888;
+	color: #888;
+	background-color: #eee;
+	border-radius: 4px;
+	padding: 2px 4px;
+	opacity: 0.9;
+    }
+    form.exportForm input:hover { color:black; border-color: black; background-color: white; opacity: 1; }
+    form.exportForm input:active { background-color: cornflowerblue; color:white; }
 }
 @media print {
     table.haladasiBejegyzesek thead tr th { border-bottom: solid 1px black;}
diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/haladasi/haladasi.phtml b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/haladasi/haladasi.phtml
index 11c42ede..0638edf6 100644
--- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/haladasi/haladasi.phtml
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/haladasi/haladasi.phtml
@@ -1,6 +1,17 @@
 <?php
     global $SZLO;
 
+    function putExportForm($ADAT) {
+	$tankorId = $ADAT['tankorId'];
+
+	formBegin(array('action'=>href('index.php?page=naplo&sub=haladasi&f=haladasi'), 'name'=>'haladasiExport', 'class'=>'exportForm'));
+	    echo '<input type="hidden" name="action" value="haladasiExport" />'."\n";
+	    echo '<input type="hidden" name="tankorId" value="'.$tankorId.'" />'."\n";
+	    echo '<input type="hidden" name="formatum" value="xml" />'."\n";
+	    echo '<input type="submit" name="Export" value="Export"/>'."\n";
+	formEnd();
+    }
+
     function putHaladasiBejegyzesek($ADAT) {
 
 	global $_TANEV,$SZLO;
@@ -19,6 +30,8 @@
 
 	if ($tankorId!='') $AKTIV_TH['tankor'] = true;
 
+	if ($tankorId!='') putExportForm($ADAT);
+
 	$FORM = array('action'=>href('index.php?page=naplo&sub=haladasi&f=haladasi'), 'name'=>'haladasiOrabeiras', 'class'=>'onChangeRequest');
 	formBegin($FORM);
 	    echo '<input type="hidden" name="igDt" value="'._SHOW_DAYS_TO.'" />'."\n";
diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/haladasi/haladasi.jquery.min.js b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/haladasi/haladasi.jquery.min.js
index 578a6f0e..68881382 100644
--- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/haladasi/haladasi.jquery.min.js
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/haladasi/haladasi.jquery.min.js
@@ -26,6 +26,12 @@ $(function() { /* onload */
 	if (x.hasClass('gomb DOA'))
 	    x.prop('disabled', false);
     });
+    $('.exportForm').click(function(event) {
+	$('table.haladasiBejegyzesek input[type="text"].data').prop('readonly',true);
+	$('table.haladasiBejegyzesek input[type="text"].data').prop('disabled',true);
+	$('table.haladasiBejegyzesek input[type="submit"].gomb').prop('readonly',true);
+	$('table.haladasiBejegyzesek input[type="submit"].gomb').prop('disabled',true);
+    });
 /*
     $('body').change(function(event) {
 	var x = $(event.target); // itt kezelhetnénk a haladasi tankorvaltasbol adodo dolgot
@@ -49,7 +55,7 @@ $(function() { /* onload */
 });
 
 processJSON = function(json) {
-    console.log(json.toDo);
+    // console.log(json.toDo);
 
     var elementId = "#ORAID_"+json.oraId.toString();
     if (json.toDo=='oraElmarad') {
diff --git a/mayor-orig/mayor-portal/log/mayor-portal.rev b/mayor-orig/mayor-portal/log/mayor-portal.rev
index 1d0d39c1..7553ea5e 100644
--- a/mayor-orig/mayor-portal/log/mayor-portal.rev
+++ b/mayor-orig/mayor-portal/log/mayor-portal.rev
@@ -1 +1 @@
-4506
+4508
diff --git a/mayor-orig/mayor-wiki/log/mayor-wiki.rev b/mayor-orig/mayor-wiki/log/mayor-wiki.rev
index 1d0d39c1..7553ea5e 100644
--- a/mayor-orig/mayor-wiki/log/mayor-wiki.rev
+++ b/mayor-orig/mayor-wiki/log/mayor-wiki.rev
@@ -1 +1 @@
-4506
+4508
diff --git a/mayor-orig/md5sum b/mayor-orig/md5sum
index 30893601..470a3f50 100644
--- a/mayor-orig/md5sum
+++ b/mayor-orig/md5sum
@@ -1,13 +1,13 @@
-Revision 4506
-499d0c382dac08e8cfafcbda9ad99018  mayor-fenntarto-rev4506.tgz
-b40b3399473b877f694faca4a5299b33  mayor-installer-sulix-rev4506.tgz
-69140ec3016d1eadc2885973d18cff30  mayor-wiki-rev4506.tgz
-9b6161a2cef9fd1a339809b8f6f8b8f3  mayor-installer-rev4506.tgz
-a97939732dc5044f36dc5a9f7d470fb9  mayor-portal-rev4506.tgz
-b482e673a2b044414636434267d0e4ee  mayor-felveteli-rev4506.tgz
-a91e9a42079331b6d4354b31964aaa89  mayor-jatek-rev4506.tgz
-887ecd5c674b577093840a83e5818d69  mayor-locales-jp_JP-rev4506.tgz
-0ae6dbb3f01754beb6a4d34e53b47e3f  mayor-locales-de_DE-rev4506.tgz
-c5c89a424c6a1ea2dd2cf0ca56ace8df  mayor-locales-en_US-rev4506.tgz
-b4ab14ceafa35420102a19a2a62869b8  mayor-naplo-rev4506.tgz
-81dd87be5577bb760fe75889c089b930  mayor-base-rev4506.tgz
+Revision 4508
+e7daa5991c8f642ccc0c68b96c295fc1  mayor-fenntarto-rev4508.tgz
+638e475a80f1f81a50dbb7ae99685401  mayor-installer-sulix-rev4508.tgz
+ed5ffc44e20254f1d4f83973fc88c83a  mayor-wiki-rev4508.tgz
+b186620b3fc00c8c15fa632330bee8ff  mayor-installer-rev4508.tgz
+b3fd9ade61bbddf14b0c1bcedaf08c91  mayor-portal-rev4508.tgz
+c904f9494a60132fea9a25c43bb005ef  mayor-felveteli-rev4508.tgz
+9adb083871b5dd7f89b44766c3d45159  mayor-jatek-rev4508.tgz
+2ca7373a492a679f7f8bc599ea0e1d7e  mayor-locales-jp_JP-rev4508.tgz
+4d627698128a5285cd524387f3e54ce7  mayor-locales-de_DE-rev4508.tgz
+09b7c481792fd063d4389c3951b0a587  mayor-locales-en_US-rev4508.tgz
+2bdb60956e0fc023b4b9ebc42579fcab  mayor-naplo-rev4508.tgz
+22c4a935a16c054dbf16540362d41d83  mayor-base-rev4508.tgz
diff --git a/mayor-orig/rev.txt b/mayor-orig/rev.txt
index 1d0d39c1..7553ea5e 100644
--- a/mayor-orig/rev.txt
+++ b/mayor-orig/rev.txt
@@ -1 +1 @@
-4506
+4508