From 0b91e03d046babc9146aac217693fdd8a3f0da74 Mon Sep 17 00:00:00 2001 From: pero1203 Date: Tue, 22 Feb 2022 12:18:33 +0100 Subject: [PATCH] Redesign - nova knjiznica znotraj ankete (V DELU), dodan ttest preview v analizah --- .../survey/classes/class.LibraryBranching.php | 336 ++++++++---------- public/css/admin_new.css | 6 +- public/img/analysis_previews/ttest.svg | 14 + .../sass/admin_new/basic/icons/standard.scss | 7 + .../pages/survey_analysis/preview.scss | 7 +- 5 files changed, 171 insertions(+), 199 deletions(-) create mode 100644 public/img/analysis_previews/ttest.svg diff --git a/admin/survey/classes/class.LibraryBranching.php b/admin/survey/classes/class.LibraryBranching.php index 53a296a1f..cb7213564 100644 --- a/admin/survey/classes/class.LibraryBranching.php +++ b/admin/survey/classes/class.LibraryBranching.php @@ -1,232 +1,139 @@ library pri datotekah, 0 -> glasovanje, 1 -> forma, 2 -> ankata na več straneh, 3 -> ifi - var $skin = 0; - - private $isSearch = 0; // ali izvajamo search po anektah - private $searchString = ''; // geslo po katerem iscemo po anketah - private $searchStringProcessed = array(); // geslo po katerem iscemo po anketah, obdelano (skrajsano da isce tudi po drugih sklanjatvah) - private $searchSettings = array(); // nastavitve searcha - - /** - * @desc konstruktor - */ - function __construct ($_options = array()) { - global $surveySkin; + var $ank_id; // Anketa znotraj katere urejamo knjiznico + var $tab = 0; // tip pove v bazi srv_library_folder za kater tip gre - 0->vprasanja, 1->ankete (vprasanja iz anket) - if (isset($surveySkin)) - $this->skin = $surveySkin; - $this->SurveyAdmin = new SurveyAdmin(1, -1); - $this->Branching = new Branching($this->SurveyAdmin->anketa); + public function __construct () { - if (isset($_options['tab'])) { - $this->tab = $_options['tab']; - if ($this->tab <= 1) - $this->tip = 0; - else - $this->tip = 1; - } - else if (isset($_POST['tab'])) { - $this->tab = ($_POST['tab'] == 0 || $_POST['tab'] == 'undefined') ? 0 : $_POST['tab']; - if ($this->tab <= 1) - $this->tip = 0; - else - $this->tip = 1; - } - else { - $this->tab = 0; - $this->tip = 0; - } - - if (isset($_options['prva'])) { - $this->prva = $_options['prva']; - } - else { - $this->prva = 0; - } - - if (isset($_GET['tab'])) $this->tab = (int)$_GET['tab']; - - // nastavimo mode v odvisnosti od survey_type ( če nismo v anketi je -1) - if (isset($this->SurveyAdmin->anketa) && $this->SurveyAdmin->anketa > 0) { - $_st = $this->SurveyAdmin->getSurvey_type($this->SurveyAdmin->anketa); - - if ($_st > -1) - $this->mode = $_st; - } - $this->repareTabs(); - - // Preverimo ce gre za search po anketah - if(isset($_GET['search']) && $_GET['search'] != ''){ - $this->isSearch = 1; - $this->searchString = str_replace("\\", "", trim($_GET['search'])); - - // Iscemo po naslovu ali vsebini - $this->searchSettings['stype'] = (isset($_GET['stype'])) ? $_GET['stype'] : '0'; - } } /** - * @desc prikaze knjiznico znotraj ankete na desni + * @desc prikaze knjiznico znotraj ankete */ - function display () { + private function displayLibrary() { global $admin_type; global $global_user_id; global $lang; - echo '
'; - echo ' '.$lang['srv_library']; - echo ''; + + // Naslov v oknu + echo '

'; + + + // Tabi (vprasanja, ankete) + echo '
'; + $this->displayTabs(); + echo '
'; + + + // Vsebina + echo '
'; + + // Levi seznam folderjev + echo '
'; + $this->displayFolderList(); echo '
'; + + + // Desna vsebina + echo '
'; + + // Seznam vprasanj + echo '
'; + $this->displayQuestionList(); + echo '
'; + + // Gumbi na dnu + echo '
'; + $this->displayButtons(); + echo '
'; - $this->display_tabs(); - - echo '
'; - - echo '
'; - $this->display_folders(); - echo '
'; - - echo '
'; + echo '
'; + + echo '
'; } - /** - * @desc prikaze tabe za izbiro - */ - function display_tabs () { + + // Prikazemo tabe - vprasanja / ankete + private function displayTabs(){ global $lang; - echo '

'; - echo 'tab==0 || $this->tab==1 ? ' class="highlightTabBlackLeft"' : ' class="nohighlight"') . ' >'; - echo '' . $lang['srv_vprasanja'] . ''; - echo 'tab==2 || $this->tab==3 ? ' class="highlightTabBlackRight"' : ' class="nohighlight"') . ' >'; - echo '' . $lang['srv_ankete'] . ''; - echo '

'; + // Tab vprasanja + echo '
'; + echo $lang['srv_vprasanja']; + echo '
'; + + // Tab ankete + echo '
'; + echo $lang['srv_ankete']; + echo '
'; } - function display_folders () { + + // Prikazemo seznam folderjev na levi + private function displayFolderList(){ global $global_user_id; global $lang; - // Knjiznica znotraj posamezne ankete - if ($this->prva == 0) { - $this->display_contentfolders(0, 0); - $this->display_contentfolders(0, $global_user_id); + // Prikazemo seznam mojih folderjev v knjiznci + $this->displayFolderParent($parent=0, $uid=$global_user_id); - if ($this->tip == 1) { - echo '

'.$lang['srv_library_edit'].'
'; - - $sql = sisplet_query("SELECT * FROM srv_library_anketa WHERE uid='".$global_user_id."' AND ank_id='".$this->SurveyAdmin->anketa."'"); - if (mysqli_num_rows($sql) == 0) { - echo '

- '.$lang['srv_library_edit_add'].' -

'; - } - - } else { - echo '

'.$lang['srv_library_q_txt'].'

'; - } - - //echo ''.$lang['srv_zapri'].''; - } - // Knjiznica na prvi strani zraven mojih anket - else { - // Na prvi strani imamo search - if($this->isSearch == 1){ - echo '
'; - $this->displaySearchSettings(); - echo '
'; - - echo '
'; - - $this->display_contentfolders_searchList(); - } - else{ - echo '
'; - $this->displaySearch(); - echo '
'; - - echo '
'; - - $this->display_contentfolders(); - } - } + // Prikazemo seznam javnih folderjev v knjiznci + $this->displayFolderParent($parent=0, $uid=0); } - /** - * @desc prikaze folderje v knjiznici - */ - function display_contentfolders ($parent = 0, $uid = -1) { + private function displayFolderParent($parent, $uid) { global $lang; global $admin_type; global $global_user_id; global $site_url; - $language = ""; - if ($uid == -1) { - if ($this->tab == 0 || $this->tab == 2) { - $uid = 0; - } else { - $uid = $global_user_id; - } + // Ce gre za root mapo prikazemo z ustreznim jezikom + if ($parent == 0 && $uid == 0) { + $language = " AND lang='".$lang['id']."' "; } - if ($parent == 0 && $uid == 0) { - $language = " AND lang='$lang[id]' "; - } - - $cookie = $_COOKIE['library_folders']; - // da se v url lahko doda odprte folderje: &libfolder=131-147 (more vkljucevat tudi parente) - if (isset($_GET['libfolder'])) $cookie .= '-'.$_GET['libfolder'].'-'; - - if ($parent == 0) { - // v skrite html elemente shranimo tab, in prva - echo 'tab").'">'; - echo 'tip").'">'; - echo 'prva").'">'; - - echo ''."\n"; - } - - if ( $parent == 0 ) { - ?> - - '; + + + // Ikoni puscice in mape + echo ' '; + echo ' '; + + // Naslov folderja + echo ' '.$title.''; + + // Stevilo itemov v folderju + echo ' '.$child_count.''; + + + // Tri pikice za prikaz urejanja folderja + echo ' '; + + // Skrit div za urejanje folderja + echo '
'; + echo ' Test'; + echo '
'; + + + echo '
'; + } + + + /** + * Popup pri dodajanju itema v knjiznico - potrditev, izbira folderja, urejanje naslova + * + * type + * - 0->anketa + * - 1->vprasanja + * - 2->if/blok + */ + public function displayAddIntoLibrary($id, $type){ + global $lang; + + // Naslov v oknu + echo '

'.$lang[''].'

'; + + // Vsebina + echo '
'; + echo 'Dodajanje...'; + echo '
'; + } + + + + /** * @desc prikaze ife / bloke v knjiznici */ diff --git a/public/css/admin_new.css b/public/css/admin_new.css index 3dbc729df..e3e3c9902 100644 --- a/public/css/admin_new.css +++ b/public/css/admin_new.css @@ -16851,8 +16851,10 @@ iframe#ifmcontentstoprint { color: #1E88E5; } #srv_analiza_preview_div .srv_analiza_preview_sub .content { - overflow: hidden; - width: auto; + width: 100%; +} +#srv_analiza_preview_div .srv_analiza_preview_sub .content img { + width: 100%; } .analysis_icons_holder { diff --git a/public/img/analysis_previews/ttest.svg b/public/img/analysis_previews/ttest.svg new file mode 100644 index 000000000..0a2af154e --- /dev/null +++ b/public/img/analysis_previews/ttest.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/resources/sass/admin_new/basic/icons/standard.scss b/resources/sass/admin_new/basic/icons/standard.scss index 85a8a63e7..5b58988d1 100644 --- a/resources/sass/admin_new/basic/icons/standard.scss +++ b/resources/sass/admin_new/basic/icons/standard.scss @@ -652,6 +652,13 @@ span.faicon.dots::before{ font-weight: 600; } +// 3 pikice - navpicne +span.faicon.dots_ver:before{ + content: "\f142"; + font-size: 16px; + font-weight: 600; +} + // Open (new tab) span.faicon.open_icon::before{ content: "\f35d"; diff --git a/resources/sass/admin_new/pages/survey_analysis/preview.scss b/resources/sass/admin_new/pages/survey_analysis/preview.scss index f79efebc1..346798a4c 100644 --- a/resources/sass/admin_new/pages/survey_analysis/preview.scss +++ b/resources/sass/admin_new/pages/survey_analysis/preview.scss @@ -46,8 +46,11 @@ } .content{ - overflow: hidden; - width: auto; + width: 100%; + + img{ + width: 100%; + } } } }