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

[Redizajn 1KA v2] - Testiranje --> Diagnostika - v5

Browse Source 
Komentarji
This commit is contained in:
tejagerjovic 2022-07-20 04:57:16 +02:00
parent 308b11fa3e
commit 99cf76e1ff
5 changed files with 192 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
admin/survey/classes/class.SurveyDiagnostics.php
View File

@ -571,10 +571,6 @@ class SurveyDiagnostics
echo '</div>'; #lastnosti_wrapper echo '</div>'; #lastnosti_wrapper
/////////////////////////////////////////////////////////////////////// Lastnosti staro
echo '</div>';
// KOMENATRJI // KOMENATRJI
# nerazrešeni komentarji uporabnikov $commentsUser,$commentsUserFinished # nerazrešeni komentarji uporabnikov $commentsUser,$commentsUserFinished
$commentsUserUnresolved = $commentsUser - $commentsUserFinished; $commentsUserUnresolved = $commentsUser - $commentsUserFinished;
@ -587,33 +583,49 @@ class SurveyDiagnostics
) > 0 ) { ) > 0 ) {
echo '<h2>'.$lang['srv_diagnostic_4_element_0'].'</h2>'; echo '<h2>'.$lang['srv_diagnostic_4_element_0'].'</h2>';
echo '<table class="srv_diagnostic_results">';
echo '<tr>'; echo '<div class="komentarji_wrapper">';
echo '<th>'.$lang['srv_diagnostic_4_element_0'].'</th>';
echo '<th>'.$lang['srv_diagnostic_unresolved'].'</th>'; echo '<div class="komentarji_left">';
echo '<th>'.$lang['srv_diagnostic_all'].'</th>'; echo '<div class="title">'.$lang['srv_testiranje_komentarji_anketa'].'</div>';
echo '</tr>';
echo '<tr>'; echo '<div class="comment_count">';
echo '<td>'.$lang['srv_diagnostic_4_element_1'].'</td>'; echo '<div>'.$lang['srv_admin_comment2'].'</div>';
echo '<td>'.(int)$commentsUnresolved.'</td>'; echo '<div><span class="semi-bold">'.(int)$commentsUnresolved.'/'.(int)$commentsAll.'</span> '.$lang['srv_inv_archive_comment2'].'</div>';
echo '<td>'.(int)$commentsAll.'</td>'; echo '</div>';
echo '</tr>';
echo '<tr>'; echo '<div class="comment_count">';
echo '<td>'.$lang['srv_diagnostic_4_element_1a'].'</td>'; echo '<div>'.$lang['srv_repondent_comment2'].'</div>';
echo '<td>'.(int)$commentsUserSurveyUnresolved.'</td>'; echo '<div><span class="semi-bold">'.(int)$commentsUserSurveyUnresolved.'/'.(int)$commentsUserSurveyAll.'</span> '.$lang['srv_inv_archive_comment2'].'</div>';
echo '<td>'.(int)$commentsUserSurveyAll.'</td>'; echo '</div>';
echo '</tr>';
echo '<tr>'; $b = new Branching($this->anketa['id']);
echo '<td>'.$lang['srv_diagnostic_4_element_6'].'</td>';
echo '<td>'.(int)$commentsQuestionUnresolved.'</td>'; $id = $b->anketa;
echo '<td>'.(int)$commentsQuestionAll.'</td>';
echo '</tr>'; echo '<a href="'.$site_url.'/admin/survey/index.php?anketa='.$id.'&a=komentarji_anketa">'.$lang['srv_testiranje_komentarji_anketa_link'].'</a>';
echo '<tr>';
echo '<td>'.$lang['srv_diagnostic_4_element_7'].'</td>'; echo '</div>'; #komentarji_left
echo '<td>'.(int)$commentsUserUnresolved.'</td>';
echo '<td>'.(int)$commentsUser.'</td>';
echo '</tr>'; echo '<div class="komentarji_right">';
echo '</table>'; echo '<div class="title">'.$lang['srv_testiranje_komentarji_title'].'</div>';
echo '<div class="comment_count">';
echo '<div>'.$lang['srv_admin_comment2'].'</div>';
echo '<div><span class="semi-bold">'.(int)$commentsQuestionUnresolved.'/'.(int)$commentsQuestionAll.'</span> '.$lang['srv_inv_archive_comment2'].'</div>';
echo '</div>';
echo '<div class="comment_count">';
echo '<div>'.$lang['srv_repondent_comment2'].'</div>';
echo '<div><span class="semi-bold">'.(int)$commentsUserUnresolved.'/'.(int)$commentsUser.'</span> '.$lang['srv_inv_archive_comment2'].'</div>';
echo '</div>';
echo '<a href="'.$site_url.'/admin/survey/index.php?anketa='.$id.'&a=komentarji">'.$lang['srv_testiranje_komentarji_title_link'].'</a>';
echo '</div>'; #komentarji_right
echo '</div>'; #komentarji_wrapper
} }
echo '</div>'; # id="srv_diagnostic" echo '</div>'; # id="srv_diagnostic"

5
lang/1.php
View File

@ -3593,7 +3593,9 @@ $lang = array (
"srv_forum_go" => "Ogled celotne teme v forumu", "srv_forum_go" => "Ogled celotne teme v forumu",
"srv_forum_back" => "Nazaj na urejanje ankete", "srv_forum_back" => "Nazaj na urejanje ankete",
"srv_admin_comment" => "Komentarji urednikov", "srv_admin_comment" => "Komentarji urednikov",
"srv_admin_comment2" => "Urednikov",
"srv_repondent_comment" => "Komentarji respondentov", "srv_repondent_comment" => "Komentarji respondentov",
"srv_repondent_comment2" => "Respondentov",
"srv_add_comment_toggle" => "Dodaj nov komentar", "srv_add_comment_toggle" => "Dodaj nov komentar",
"srv_add_comment" => "Dodaj komentar", "srv_add_comment" => "Dodaj komentar",
"srv_view_comment" => "Poglej komentarje", "srv_view_comment" => "Poglej komentarje",
@ -5146,6 +5148,7 @@ $lang = array (
'srv_inv_archive_cnt_succsess' => "Uspešno poslanih", 'srv_inv_archive_cnt_succsess' => "Uspešno poslanih",
'srv_inv_archive_cnt_error' => "Napak", 'srv_inv_archive_cnt_error' => "Napak",
'srv_inv_archive_comment' => "Komentar", 'srv_inv_archive_comment' => "Komentar",
'srv_inv_archive_comment2' => "komentarjev",
'srv_inv_archive_sender' => "Poslal/-a", 'srv_inv_archive_sender' => "Poslal/-a",
'srv_inv_archive_email_address' => "Email prejemnika", 'srv_inv_archive_email_address' => "Email prejemnika",
'srv_inv_archive_status' => "Status", 'srv_inv_archive_status' => "Status",
@ -5372,7 +5375,9 @@ $lang = array (
"srv_testiranje_diagnostika_base" => "Osnovna diagnostika", "srv_testiranje_diagnostika_base" => "Osnovna diagnostika",
"srv_testiranje_komentarji" => "Komentarji", "srv_testiranje_komentarji" => "Komentarji",
"srv_testiranje_komentarji_anketa" => "Komentarji na anketo", "srv_testiranje_komentarji_anketa" => "Komentarji na anketo",
"srv_testiranje_komentarji_anketa_link" => "Oglej si komentarje na anketo",
"srv_testiranje_komentarji_title" => "Komentarji na vprašanja", "srv_testiranje_komentarji_title" => "Komentarji na vprašanja",
"srv_testiranje_komentarji_title_link" => "Oglej si komentarje na vprašanja",
"srv_testiranje_komentar_q_title" => "Komentar na vprašanje", "srv_testiranje_komentar_q_title" => "Komentar na vprašanje",
"srv_testiranje_komentar_q_all_title" => "Komentarji na vprašanje", "srv_testiranje_komentar_q_all_title" => "Komentarji na vprašanje",
"srv_testiranje_komentar_q_resp_all_title" => "Komentarji respondentov na vprašanje", "srv_testiranje_komentar_q_resp_all_title" => "Komentarji respondentov na vprašanje",

3
lang/2.php
View File

@ -4002,7 +4002,9 @@ $lang = array (
"srv_collectData" => "Data preparation", "srv_collectData" => "Data preparation",
"srv_testiranje_komentarji" => "Comments", "srv_testiranje_komentarji" => "Comments",
"srv_testiranje_komentarji_anketa" => "Survey comments", "srv_testiranje_komentarji_anketa" => "Survey comments",
"srv_testiranje_komentarji_anketa_link" => "View survey comments",
"srv_testiranje_komentarji_title" => "Question comments", "srv_testiranje_komentarji_title" => "Question comments",
"srv_testiranje_komentarji_title_link" => "View question comments",
"srv_testiranje_komentar_q_title" => "Question comment", "srv_testiranje_komentar_q_title" => "Question comment",
"srv_testiranje_komentar_q_all_title" => "Question comments", "srv_testiranje_komentar_q_all_title" => "Question comments",
"srv_testiranje_komentar_q_resp_all_title" => "Respondnet question comments", "srv_testiranje_komentar_q_resp_all_title" => "Respondnet question comments",
@ -5115,6 +5117,7 @@ $lang = array (
'srv_inv_archive_cnt_succsess' => "Successfully sent", 'srv_inv_archive_cnt_succsess' => "Successfully sent",
'srv_inv_archive_cnt_error' => "Errors", 'srv_inv_archive_cnt_error' => "Errors",
'srv_inv_archive_comment' => "Comment", 'srv_inv_archive_comment' => "Comment",
'srv_inv_archive_comment2' => "comments",
'srv_inv_archive_sender' => "Sender", 'srv_inv_archive_sender' => "Sender",
'srv_inv_archive_email_address' => "Respondent email", 'srv_inv_archive_email_address' => "Respondent email",
'srv_inv_archive_status' => "Status", 'srv_inv_archive_status' => "Status",

110
public/css/admin_new.css
View File

@ -24216,78 +24216,79 @@ div#srv_diagnostic table td div.status_wrapper div.status a {
color: inherit; color: inherit;
text-decoration: none; text-decoration: none;
} }
div#srv_diagnostic div.lastnosti_wrapper { div#srv_diagnostic .lastnosti_wrapper {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: space-between; align-items: space-between;
gap: 32px; gap: 32px;
} }
div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_left, div#srv_diagnostic .lastnosti_wrapper .lastnosti_left,
div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_middle { div#srv_diagnostic .lastnosti_wrapper .lastnosti_middle {
width: 33%; width: 33%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
gap: 16px; gap: 16px;
} }
div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_left .box, div#srv_diagnostic .lastnosti_wrapper .lastnosti_left .box,
div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_middle .box { div#srv_diagnostic .lastnosti_wrapper .lastnosti_middle .box {
border: 1px solid #E5E5E5; border: 1px solid #E5E5E5;
border-radius: 2px; border-radius: 2px;
padding: 16px; padding: 16px;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
box-sizing: border-box; box-sizing: border-box;
min-height: 162px;
} }
div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_left .box .title, div#srv_diagnostic .lastnosti_wrapper .lastnosti_left .box .title,
div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_middle .box .title { div#srv_diagnostic .lastnosti_wrapper .lastnosti_middle .box .title {
text-transform: uppercase; text-transform: uppercase;
font-weight: 600; font-weight: 600;
margin-bottom: 16px; margin-bottom: 16px;
} }
div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_left .box .diagnostic_graph, div#srv_diagnostic .lastnosti_wrapper .lastnosti_left .box .diagnostic_graph,
div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_middle .box .diagnostic_graph { div#srv_diagnostic .lastnosti_wrapper .lastnosti_middle .box .diagnostic_graph {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
margin-top: -8px; margin-top: -8px;
} }
div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_left .box .diagnostic_graph .circle, div#srv_diagnostic .lastnosti_wrapper .lastnosti_left .box .diagnostic_graph .circle,
div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_middle .box .diagnostic_graph .circle { div#srv_diagnostic .lastnosti_wrapper .lastnosti_middle .box .diagnostic_graph .circle {
height: 88px; height: 88px;
width: 88px; width: 88px;
margin-right: 16px; margin-right: 16px;
} }
div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_left .box .diagnostic_graph .other_text, div#srv_diagnostic .lastnosti_wrapper .lastnosti_left .box .diagnostic_graph .other_text,
div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_middle .box .diagnostic_graph .other_text { div#srv_diagnostic .lastnosti_wrapper .lastnosti_middle .box .diagnostic_graph .other_text {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: center; justify-content: center;
gap: 16px; gap: 16px;
} }
div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_left .box .diagnostic_graph .other_text a, div#srv_diagnostic .lastnosti_wrapper .lastnosti_left .box .diagnostic_graph .other_text a,
div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_middle .box .diagnostic_graph .other_text a { div#srv_diagnostic .lastnosti_wrapper .lastnosti_middle .box .diagnostic_graph .other_text a {
text-decoration: none; text-decoration: none;
font-size: 14px !important; font-size: 14px !important;
white-space: nowrap; white-space: nowrap;
} }
div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_left .box .time, div#srv_diagnostic .lastnosti_wrapper .lastnosti_left .box .time,
div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_middle .box .time { div#srv_diagnostic .lastnosti_wrapper .lastnosti_middle .box .time {
font-size: 40px; font-size: 32px;
margin-bottom: 12px; margin-bottom: 12px;
} }
div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_left .box .time span.time_text, div#srv_diagnostic .lastnosti_wrapper .lastnosti_left .box .time span.time_text,
div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_middle .box .time span.time_text { div#srv_diagnostic .lastnosti_wrapper .lastnosti_middle .box .time span.time_text {
font-size: 14px !important; font-size: 14px !important;
} }
div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_left .box a, div#srv_diagnostic .lastnosti_wrapper .lastnosti_left .box a,
div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_middle .box a { div#srv_diagnostic .lastnosti_wrapper .lastnosti_middle .box a {
text-decoration: none; text-decoration: none;
font-size: 14px !important; font-size: 14px !important;
white-space: nowrap; white-space: nowrap;
} }
div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_right { div#srv_diagnostic .lastnosti_wrapper .lastnosti_right {
width: 33%; width: 33%;
} }
div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_right .box { div#srv_diagnostic .lastnosti_wrapper .lastnosti_right .box {
border: 1px solid #E5E5E5; border: 1px solid #E5E5E5;
border-radius: 2px; border-radius: 2px;
display: flex; display: flex;
@ -24295,45 +24296,88 @@ div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_right .box {
box-sizing: border-box; box-sizing: border-box;
height: 100%; height: 100%;
} }
div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_right .box .vertical_section { div#srv_diagnostic .lastnosti_wrapper .lastnosti_right .box .vertical_section {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
box-sizing: border-box; box-sizing: border-box;
justify-content: space-between; justify-content: space-between;
} }
div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_right .box .vertical_section .item { div#srv_diagnostic .lastnosti_wrapper .lastnosti_right .box .vertical_section .item {
font-size: 14px !important; font-size: 14px !important;
padding: 13px 16px; padding: 13px 16px;
white-space: nowrap; white-space: nowrap;
} }
div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_right .box .vertical_section .item:not(:last-of-type) { div#srv_diagnostic .lastnosti_wrapper .lastnosti_right .box .vertical_section .item:not(:last-of-type) {
border-bottom: 1px solid #E5E5E5; border-bottom: 1px solid #E5E5E5;
} }
div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_right .box .vertical_section.second { div#srv_diagnostic .lastnosti_wrapper .lastnosti_right .box .vertical_section.second {
width: 100%; width: 100%;
} }
div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_right .box .vertical_section.second .item { div#srv_diagnostic .lastnosti_wrapper .lastnosti_right .box .vertical_section.second .item {
font-weight: 600; font-weight: 600;
text-transform: lowercase; text-transform: lowercase;
} }
div#srv_diagnostic div.input_box { div#srv_diagnostic .komentarji_wrapper {
display: flex;
flex-direction: row;
gap: 32px;
}
div#srv_diagnostic .komentarji_wrapper .komentarji_left,
div#srv_diagnostic .komentarji_wrapper .komentarji_right {
width: 50%;
border: 1px solid #E5E5E5;
border-radius: 2px;
padding: 16px;
display: flex;
flex-direction: column;
box-sizing: border-box;
}
div#srv_diagnostic .komentarji_wrapper .komentarji_left .title,
div#srv_diagnostic .komentarji_wrapper .komentarji_right .title {
text-transform: uppercase;
font-weight: 600;
margin-bottom: 16px;
}
div#srv_diagnostic .komentarji_wrapper .komentarji_left .comment_count,
div#srv_diagnostic .komentarji_wrapper .komentarji_right .comment_count {
width: 100%;
display: flex;
flex-direction: row;
justify-content: space-between;
padding-bottom: 8px;
border-bottom: 1px solid #E5E5E5;
margin-bottom: 8px;
}
div#srv_diagnostic .komentarji_wrapper .komentarji_left .comment_count:last-of-type,
div#srv_diagnostic .komentarji_wrapper .komentarji_right .comment_count:last-of-type {
padding-bottom: 0;
border-bottom: none;
margin-bottom: 16px;
}
div#srv_diagnostic .komentarji_wrapper .komentarji_left a,
div#srv_diagnostic .komentarji_wrapper .komentarji_right a {
text-decoration: none;
font-size: 14px !important;
white-space: nowrap;
}
div#srv_diagnostic .input_box {
display: flex; display: flex;
width: 300px; width: 300px;
padding: 10px 0 10px 8px; padding: 10px 0 10px 8px;
border: 1px solid #C4C4C4; border: 1px solid #C4C4C4;
} }
div#srv_diagnostic div.input_box input { div#srv_diagnostic .input_box input {
border: none; border: none;
margin: 0; margin: 0;
padding: 0; padding: 0;
font-size: 16px; font-size: 16px;
width: 90%; width: 90%;
} }
div#srv_diagnostic div.button_holder { div#srv_diagnostic .button_holder {
align-items: center; align-items: center;
margin-bottom: 0; margin-bottom: 0;
} }
div#srv_diagnostic div.button_holder button { div#srv_diagnostic .button_holder button {
margin: 0 0 0 8px; margin: 0 0 0 8px;
} }

68
resources/sass/admin_new/pages/survey_testiranje/diagnostika.scss
View File

@ -59,14 +59,14 @@ div#srv_diagnostic {
} }
} }
div.lastnosti_wrapper { .lastnosti_wrapper {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: space-between; align-items: space-between;
gap: 32px; gap: 32px;
div.lastnosti_left, .lastnosti_left,
div.lastnosti_middle { .lastnosti_middle {
width: 33%; width: 33%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
@ -81,6 +81,8 @@ div#srv_diagnostic {
flex-direction: column; flex-direction: column;
box-sizing: border-box; box-sizing: border-box;
min-height: 162px;
.title { .title {
text-transform: uppercase; text-transform: uppercase;
font-weight: $semi-bold; font-weight: $semi-bold;
@ -113,7 +115,7 @@ div#srv_diagnostic {
} }
.time { .time {
font-size: 40px; font-size: 32px;
margin-bottom: 12px; margin-bottom: 12px;
span.time_text { span.time_text {
@ -129,7 +131,7 @@ div#srv_diagnostic {
} }
} }
div.lastnosti_right { .lastnosti_right {
width: 33%; width: 33%;
.box { .box {
@ -172,7 +174,59 @@ div#srv_diagnostic {
} }
} }
div.input_box {
.komentarji_wrapper {
display: flex;
flex-direction: row;
gap: 32px;
.komentarji_left,
.komentarji_right {
width: 50%;
border: 1px solid $gray;
border-radius: 2px;
padding: 16px;
display: flex;
flex-direction: column;
box-sizing: border-box;
.title {
text-transform: uppercase;
font-weight: $semi-bold;
margin-bottom: 16px;
}
.comment_count {
width: 100%;
display: flex;
flex-direction: row;
justify-content: space-between;
padding-bottom: 8px;
border-bottom: 1px solid $gray;
margin-bottom: 8px;
&:last-of-type {
padding-bottom: 0;
border-bottom: none;
margin-bottom: 16px;
}
}
a {
text-decoration: none;
font-size: 14px !important;
white-space: nowrap;
}
}
}
.input_box {
display: flex; display: flex;
width: 300px; width: 300px;
@ -189,7 +243,7 @@ div#srv_diagnostic {
} }
} }
div.button_holder { .button_holder {
align-items: center; align-items: center;
margin-bottom: 0; margin-bottom: 0;
button { button {