From 0befa7333612829883390c4bcd5a025810722013 Mon Sep 17 00:00:00 2001 From: pero1203 Date: Wed, 2 Mar 2022 09:51:46 +0100 Subject: [PATCH 1/2] Redesign - dodajanje vprasanja v knjiznico --- .../survey/classes/class.LibraryBranching.php | 82 +++++++++++++------ admin/survey/classes/class.Vprasanje.php | 21 +++++ admin/survey/script/library.js | 10 ++- lang/1.php | 2 + lang/2.php | 2 + 5 files changed, 90 insertions(+), 27 deletions(-) diff --git a/admin/survey/classes/class.LibraryBranching.php b/admin/survey/classes/class.LibraryBranching.php index 58155b231..cd7027e0d 100644 --- a/admin/survey/classes/class.LibraryBranching.php +++ b/admin/survey/classes/class.LibraryBranching.php @@ -426,18 +426,50 @@ class LibraryBranching { * - 1->vprasanja * - 2->if/blok */ - private function displayAddIntoLibrary($id, $type){ + private function displayAddIntoLibrary($item_id, $type){ global $lang; // Naslov v oknu - echo '

'.$lang[''].'

'; + echo '

'.$lang['srv_library_add_to_lib_title'].'

'; // Vsebina echo '
'; echo 'Dodajanje...'; echo '
'; + + echo '
'; + echo ' '; + echo ' '; + echo '
'; } + private function getRootFolder(){ + global $global_user_id; + global $lang; + + $sqlFolder = sisplet_query("SELECT id FROM srv_library_folder WHERE uid='".$global_user_id."' AND parent='0' AND tip='0' AND lang='".$lang['id']."'"); + + // Za prvic ko pride user, da mu dodamo folder + if (mysqli_num_rows($sqlFolder) == 0){ + + // Nastavimo naslov mape + $naslov = $lang['srv_moja_vprasanja']; + + sisplet_query("INSERT INTO srv_library_folder + (uid, tip, naslov, parent, lang) + VALUES + ('".$global_user_id."', '0', '".$naslov."', '0', '".$lang['id']."') + "); + + $root_folder_id = mysqli_insert_id($GLOBALS['connect_db']); + } + else{ + $rowFolder = mysqli_fetch_array($sqlFolder); + $root_folder_id = $rowFolder['id']; + } + + return $root_folder_id; + } /** @@ -582,7 +614,7 @@ class LibraryBranching { $item_ids = $_POST['item_ids']; - $b = new Branching($this->anketa); + $b = new Branching($this->ank_id); $ba = new BranchingAjax($this->ank_id); foreach(array_reverse($item_ids) as $item_id){ @@ -618,37 +650,37 @@ class LibraryBranching { // Odpremo popup za dodajanje itema v knjiznico elseif ($_GET['a'] == 'displayAddIntoLibraryPopup') { - $this->displayAddIntoLibrary(); + + $item_id = $_POST['item_id']; + $type = $_POST['type']; + + $this->displayAddIntoLibrary($item_id, $type); } // Dodajanje itema v knjiznico elseif ($_GET['a'] == 'addIntoLibrary') { - /*$data = array(); + $item_id = $_POST['item_id']; + $type = $_POST['type']; - $spremenljivka = substr($_POST['spremenljivka'], 10); // odrezemo branching_ - $folder = $_POST['folder']; + $folder_id = $this->getRootFolder(); + + if ($item_id > 0) { - // v knjiznico dodamo spremenljivko - if ($spremenljivka > 0) { - $id = $this->Branching->nova_spremenljivka(-1, 0, 0, $spremenljivka); - sisplet_query("UPDATE srv_spremenljivka SET folder = '$folder' WHERE id = '$id'"); + $b = new Branching($this->ank_id); - $data['response'] = $lang['srv_library_q_added']; - - // v knjiznico dodamo if/blok - } else { - $if = substr($_POST['spremenljivka'], 12); // odrezemo branching_if - - if ($if > 0) { - $id = $this->Branching->if_copy(0, $if, true); - sisplet_query("UPDATE srv_if SET folder = '$folder' WHERE id = '$id'"); - - $data['response'] = $lang['srv_library_b_added']; + // v knjiznico dodamo spremenljivko + if($type == 1) { + $id = $b->nova_spremenljivka(-1, 0, 0, $item_id); + sisplet_query("UPDATE srv_spremenljivka SET folder='".$folder_id."' WHERE id='".$id."'"); + } - }*/ - - + // v knjiznico dodamo if/blok + elseif($type == 2) { + $id = $b->if_copy(0, $item_id, true); + sisplet_query("UPDATE srv_if SET folder='".$folder_id."' WHERE id='".$id."'"); + } + } } } } diff --git a/admin/survey/classes/class.Vprasanje.php b/admin/survey/classes/class.Vprasanje.php index eb34284d4..94b60dbc5 100644 --- a/admin/survey/classes/class.Vprasanje.php +++ b/admin/survey/classes/class.Vprasanje.php @@ -273,6 +273,9 @@ class Vprasanje { // opomba na vprasanje $this->edit_opomba(); + // Dodaj vprasanje v knjiznico + $this->add_into_library(); + echo ''; @@ -1955,6 +1958,24 @@ class Vprasanje { // ob spremembi opombe, damo drug value tudi na radio Da, da se ob shranjevanju desnega menija shrani nova opomba, ce je bila spremenenjena ?>spremenljivka); + + echo '
'; + + echo '
'; + echo ' '; + echo '
'; + + echo '
'; + + // ob spremembi opombe, damo drug value tudi na radio Da, da se ob shranjevanju desnega menija shrani nova opomba, ce je bila spremenenjena + ?> "Odstrani direktorij", "srv_library_folder_rename" => "Preimenuj direktorij", "srv_library_folder_name" => "Ime direktorija", + "srv_library_add_to_lib_title" => "Dodaj element v knjižnico", + "srv_library_add_to_lib" => "Dodaj v knjižnico", "srv_nadzor" => "Nadzor", "srv_knjiznica_add" => "Če želite dodati spremenljivko v knjižnico, jo povlecite v to polje", "srv_knjiznica_copy" => "Če želite kopirati vprašanje, ga označite z ikono COPY", diff --git a/lang/2.php b/lang/2.php index e46ef1e51..e8b659809 100644 --- a/lang/2.php +++ b/lang/2.php @@ -2358,6 +2358,8 @@ $lang = array ( "srv_library_folder_delete" => "Remove folder", "srv_library_folder_rename" => "Rename folder", "srv_library_folder_name" => "Folder name", + "srv_library_add_to_lib_title" => "Add element to library", + "srv_library_add_to_lib" => "Add to library", "srv_nadzor" => "Supervise", "srv_knjiznica_add" => "To add a question to a library, drag it to this field", "srv_knjiznica_copy" => "To copy a question, click on COPY icon", From 4940d61c734f2ec88003eaf98b68c5f3b230ce81 Mon Sep 17 00:00:00 2001 From: pero1203 Date: Wed, 2 Mar 2022 13:04:22 +0100 Subject: [PATCH 2/2] UL evalvacija - upload povzetkov na GC --- admin/survey/modules/Evalvacija/class.GC.php | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/admin/survey/modules/Evalvacija/class.GC.php b/admin/survey/modules/Evalvacija/class.GC.php index f2da9e048..f1e5b218e 100644 --- a/admin/survey/modules/Evalvacija/class.GC.php +++ b/admin/survey/modules/Evalvacija/class.GC.php @@ -51,10 +51,8 @@ class GC{ var $login = 'AnketniSistem'; // User za login var $password = 'AnketniSistem'; // Password za login - //var $year = '2017_2018'; // Letnica za porocilo - //var $year = '2018_2019'; // Letnica za porocilo - //var $year = '2019_2020'; // Letnica za porocilo - var $year = '2020_2021'; // Letnica za porocilo + //var $year = '2020_2021'; // Letnica za porocilo + var $year = '2021_2022'; // Letnica za porocilo var $izvajalec_table = ''; // Katero tabelo izvajalcev uporabljamo - navadna (eval_izvajalec) ali testna (eval_izvajalec2) @@ -188,14 +186,14 @@ class GC{ '4_1' => 'predmeti' ); - $reports_id = '11112021'; - $report_type = '2_7'; - $fak_id = '3000021'; + $reports_id = '02032022'; + $report_type = '1_1'; + $fak_id = '3000001'; $zip_name = ''; // Nastavimo pot do pdf-jev - $this->pdf_path = 'modules/Evalvacija/pdf/unzipped/'; - //$this->pdf_path = 'modules/Evalvacija/pdf/unzipped/'.$fakultete[$fak_id]['kratica'].'/'; + //$this->pdf_path = 'modules/Evalvacija/pdf/unzipped/'; + $this->pdf_path = 'modules/Evalvacija/pdf/unzipped/'.$fakultete[$fak_id]['kratica'].'/'; //$this->pdf_path = 'modules/Evalvacija/pdf/unzipped/'.$fakultete[$fak_id]['kratica'].'/'.$report_type_array[$report_type].'/'; echo 'Parametri:'; @@ -211,7 +209,7 @@ class GC{ //$this->executeManualUpload($zip_name, $fak_id, $report_type, $reports_id, $unzip=false); // BRANJE POROCIL - IZVAJALEC - //$response = $this->readFolder($zadeva_id='RezultatiAnket_'.$fak_id.'_2', $fakultete[$fak_id]['kratica']); + //$response = $this->readFolder($zadeva_id='RezultatiAnket_'.$fak_id.'_321', $fakultete[$fak_id]['kratica']); // BRANJE POROCIL - FAKULTETA //$response = $this->readFolder($zadeva_id='RezultatiAnket_'.$fak_id.'_2020_2021', $fakultete[$fak_id]['kratica']);