may/1KA_F2F
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://git.1ka.si/git/1ka

Browse Source
This commit is contained in:
pero1203 2022-08-24 11:07:30 +02:00
commit d08392bcdb
9 changed files with 74 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
admin/survey/classes/surveyAnalysis/class.SurveyAnalysis.php
View File

@ -607,6 +607,7 @@ class SurveyAnalysis {
}
echo '<script src="\admin\survey\script\urejanje_oblika.js"> </script>';
echo '<table class="table_desc" >';
echo '<tr class="row1">';
@ -818,7 +819,8 @@ class SurveyAnalysis {
echo '<td class="cell_icons cell_icons'.$spid.' test" id="cell_icons'.$spid.'">';
// self::showIcons($spid,$spremenljivka,'desc');
echo '<button onclick="show_settings_survey_analysis(\''.$spid.'\')"> <i class="fa-solid fa-ellipsis"></i> </button>';
// echo '<button onclick="show_settings_survey_analysis(\''.$spid.'\')"> <i class="fa-solid fa-ellipsis"></i> </button>';
echo '<span class="faicon dots" onclick="show_settings_survey_analysis(\''.$spid.'\')" > </span>';
echo '<div class= "options displayNone" id="options'.$spid.'">';
self::showIcons($spid,$spremenljivka,'desc');
echo '</div>'; //options
@ -1008,6 +1010,7 @@ class SurveyAnalysis {
# tekst vprašanja
echo '<script src="\admin\survey\script\urejanje_oblika.js"> </script>';
echo '<table class="table_freq">';
# naslovna vrstica
@ -1047,7 +1050,8 @@ class SurveyAnalysis {
#variabla
echo '<td class="cell_icons cell_icons'.$spid.' test" id="cell_icons'.$spid.'">';
// self::showIcons($spid,$spremenljivka,'freq');
echo '<button onclick="show_settings_survey_analysis(\''.$spid.'\')"> <i class="fa-solid fa-ellipsis"></i> </button>';
// echo '<button onclick="show_settings_survey_analysis(\''.$spid.'\')"> <i class="fa-solid fa-ellipsis"></i> </button>';
echo '<span class="faicon dots" onclick="show_settings_survey_analysis(\''.$spid.'\')" > </span>';
echo '<div class= "options displayNone" id="options'.$spid.'">';
self::showIcons($spid,$spremenljivka,'freq');
echo '</div>'; //options

2
admin/survey/export/latexclasses/class.LatexDocument.php
View File

@ -1419,6 +1419,8 @@ class LatexDocument{
$numOfAt = substr_count($text, $findAt); //stevilo '@' v besedilu
$findNewline = 'br';
$text = preg_replace("/<\/?a( [^>]*)?>/i", "", $text); //remove anchor tag from string <a href= ... </a>, to se je uredilo za rešiti <a href= mailto: ...
$posAt = strpos($text, $findAt);
if($posAt && $posSpace1){ //ce je prisotna afna in je prisoten presledek v besedilu
$posSpace1Mail = strpos(substr($text, $posAt), $findSpace); //najdi pozicijo prvega presledka v besedilu po e-naslovu

13
admin/survey/export/latexclasses/class.LatexSurvey.php
View File

@ -1482,15 +1482,20 @@ class LatexSurvey{
$numOfAt = substr_count($text, $findAt); //stevilo '@' v besedilu
$findNewline = 'br';
$text = preg_replace("/<\/?a( [^>]*)?>/i", "", $text); //remove anchor tag from string <a href= ... </a>, to se je uredilo za rešiti <a href= mailto: ...
$posAt = strpos($text, $findAt);
if($posAt && $posSpace1){ //ce je prisotna afna in je prisoten presledek v besedilu
$posSpace1Mail = strpos(substr($text, $posAt), $findSpace); //najdi pozicijo prvega presledka v besedilu po e-naslovu
$posSpace1Mail = $posSpace1Mail+$posAt; //koncna pozicija, ce se gleda celotno besedilo
//echo $posSpace1Mail."</br>";
//echo "pozicija prvega presledka v besedilu po e-naslovu: ".$posSpace1Mail."</br>";
//najdi prvi presledek pred afno
$posSpace2Mail = strripos(substr($text, 0, $posAt), $findSpace); //najdi pozicijo zadnjega presledka v besedilu pred e-naslovom
//echo $posSpace2Mail."</br>";
//echo "pozicijo zadnjega presledka v besedilu pred e-naslovom: ".$posSpace2Mail."</br>";
//najdi prvi simbol za v novo vrstico "br" po afni
//echo substr($text, $posAt) ."</br>";
@ -1502,6 +1507,7 @@ class LatexSurvey{
}else{
$posKonec = $posNewLineMail; //se zakljuci pred simbolom za novo vrstico, ker je ta lokacija za zakljucek url
}
//echo "posKonec: ".$posKonec."</br>";
//dodaj po e-naslovu potrebno latex kodo za zakljucek url
//$text = substr_replace($text, '}', $posSpace1Mail, 0);
@ -1509,8 +1515,9 @@ class LatexSurvey{
//dodaj pred e-naslovom potrebno latex kodo za url
//substr_replace(string_name, replacement_string, start_pos, length)
$text = substr_replace($text, ' \url{', $posSpace2Mail+1, 0);
$text = substr_replace($text, ' \url{', $posSpace2Mail, 0);
//echo $text."</br>";
}
//detekcija prisotnosti e-naslova v besedilu in primerna preureditev, da pride do pravilnega izpisa - konec

4
admin/survey/export/latexclasses/class.LatexSurveyElement.php
View File

@ -1060,11 +1060,13 @@ class LatexSurveyElement{
$numOfAt = substr_count($text, $findAt); //stevilo '@' v besedilu
$findNewline = 'br';
$text = preg_replace("/<\/?a( [^>]*)?>/i", "", $text); //remove anchor tag from string <a href= ... </a>, to se je uredilo za rešiti <a href= mailto: ...
$posAt = strpos($text, $findAt);
if($posAt && $posSpace1){ //ce je prisotna afna in je prisoten presledek v besedilu
$posSpace1Mail = strpos(substr($text, $posAt), $findSpace); //najdi pozicijo prvega presledka v besedilu po e-naslovu
$posSpace1Mail = $posSpace1Mail+$posAt; //koncna pozicija, ce se gleda celotno besedilo
//echo $posSpace1Mail."</br>";
//echo "pozicija prvega presledka v besedilu po e-naslovu: ".$posSpace1Mail."</br>";
//najdi prvi presledek pred afno
$posSpace2Mail = strripos(substr($text, 0, $posAt), $findSpace); //najdi pozicijo zadnjega presledka v besedilu pred e-naslovom

28
public/css/admin_new.css
View File

@ -10048,7 +10048,6 @@ textarea:focus {
font-size: 32px;
color: #333;
font-weight: 400;
margin-right: 5px;
}
.box-container .checked {
border: #1E88E5 solid 1px;
@ -10062,16 +10061,20 @@ textarea:focus {
.box-container #num_box2 {
background-color: rgba(255, 0, 0, 0.05);
}
.box-container #num_box3 {
background-color: #FFFFFF;
}
table.gdpr_surveys td {
font-size: 14px;
}
table.gdpr_surveys tr.green_row td {
background-color: rgba(20, 255, 0, 0.05) !important;
table.gdpr_surveys tr.green_row {
background-color: #F3FFF2 !important;
}
table.gdpr_surveys tr.red_row td {
background-color: rgba(255, 0, 0, 0.05) !important;
table.gdpr_surveys tr.red_row {
background-color: #FFEFEF !important;
}
table.gdpr_surveys tr.grey_row {
@ -10167,7 +10170,7 @@ div .table-horizontal-scroll-wrapper2 table {
#anketa_edit .page_num_fieldset {
border: unset;
border-top: 1px dashed #E5E5E5;
width: 100%;
padding: 0px;
}
.page_num_fieldset {
@ -10193,11 +10196,11 @@ div .table-horizontal-scroll-wrapper2 table {
}
.table_header tr td:first-of-type {
width: 40%;
padding-left: 48px;
padding-left: 16px;
}
.table_header tr td:last-of-type {
width: 60%;
padding-left: 25px;
padding-left: 16px;
}
.avt_vnosi_table td:first-of-type {
@ -30041,6 +30044,8 @@ iframe#ifmcontentstoprint {
position: relative;
}
#div_analiza_data .options {
width: 220px;
z-index: 9999;
position: absolute;
left: 17px;
top: 40px;
@ -30050,6 +30055,13 @@ iframe#ifmcontentstoprint {
cursor: pointer;
color: #1e88e5;
}
#div_analiza_data .faicon.dots:hover {
color: #0059ab;
}
.cell_icons {
position: relative;
}
.analysis_icons_holder {
background-color: white;

12
resources/sass/admin_new/components/form/seznam_anket.scss
View File

@ -57,7 +57,6 @@
color: #333;
font-weight: 400;
margin-right: 5px;
}
}
@ -78,7 +77,7 @@
background-color: rgba(255, 0, 0, 0.05);
}
#num_box3{
//
background-color: #FFFFFF;
}
}
@ -89,12 +88,13 @@ table.gdpr_surveys{
}
table.gdpr_surveys tr.green_row td {
background-color: rgba(20, 255, 0, 0.05) !important;
table.gdpr_surveys tr.green_row {
background-color: #F3FFF2 !important;
}
table.gdpr_surveys tr.red_row td{
table.gdpr_surveys tr.red_row {
// background-color: #FF0000 !important;
background-color: rgba(255, 0, 0, 0.05) !important;
background-color: #FFEFEF !important;
}
table.gdpr_surveys tr.grey_row {
background-color: #ffffff !important;

6
resources/sass/admin_new/components/table/table.scss
View File

@ -110,7 +110,7 @@ div {
#anketa_edit .page_num_fieldset{
border: unset;
border-top: 1px dashed #E5E5E5;
width: 100%;
padding: 0px;
}
@ -142,11 +142,11 @@ div {
td:first-of-type {
width: 40%;
padding-left: 48px;
padding-left: 16px;
}
td:last-of-type {
width: 60%;
padding-left: 25px;
padding-left: 16px;
}
}
}

12
resources/sass/admin_new/pages/survey_analysis/icons.scss
View File

@ -7,7 +7,8 @@
}
.options{
// width: 200px;
width: 220px;
z-index: 9999;
position: absolute;
left: 17px;
@ -20,13 +21,16 @@
cursor: pointer;
color: #1e88e5;
}
.faicon.dots:hover{
color: #0059ab;
}
}
// .cell_icons {
// position: relative;
// }
.cell_icons {
position: relative;
}
// .options{
// border: 1px solid red;