diff --git a/admin/survey/classes/class.SurveyParaAnalysis.php b/admin/survey/classes/class.SurveyParaAnalysis.php index 792564237..59cd9456c 100644 --- a/admin/survey/classes/class.SurveyParaAnalysis.php +++ b/admin/survey/classes/class.SurveyParaAnalysis.php @@ -896,8 +896,14 @@ class SurveyParaAnalysis{ $this->displayFormula(); - - + + echo '
'; + echo '
'; + + echo ''; + echo ''; echo ''; @@ -1171,6 +1177,8 @@ class SurveyParaAnalysis{ } } echo '
'; + echo '
'; + echo '
'; SurveyAnalysisHelper::getInstance()->displayMissingLegend(); } diff --git a/admin/survey/classes/class.SurveyTelephone.php b/admin/survey/classes/class.SurveyTelephone.php index b8416f8b8..8fc44ecd7 100644 --- a/admin/survey/classes/class.SurveyTelephone.php +++ b/admin/survey/classes/class.SurveyTelephone.php @@ -205,9 +205,18 @@ class SurveyTelephone { $date_to = ''; if(isset($_GET['date_to'])) $date_to = strtotime($_GET['date_to']); + + echo '
'; + + echo $lang['s_from'].':'; + echo ''; + echo $lang['s_to'].':'; + echo ''; + + echo ''.$lang['srv_telephone_dashboard_legend_datum'].''; + + echo '
'; - echo ''.$lang['s_from'].': '; - echo ''.$lang['s_to'].': '; echo ''; - echo ''.$lang['srv_clear'].''; echo ''; @@ -410,7 +418,6 @@ class SurveyTelephone { echo ''.Common::formatNumberSimple(((int)$recipients_by_status['contacted'] > 0 ? (int)$recipients_by_status['finished']*100/(int)$recipients_by_status['contacted'] : 0),0,'%').''; echo ''; echo ''; - echo '
'; echo ''; echo ''; } @@ -440,7 +447,6 @@ class SurveyTelephone { } echo ''; - echo '
'; echo ''; echo ''; @@ -516,7 +522,6 @@ class SurveyTelephone { function addRecipientsView( $fields = array(), $recipients_list=null) { #prikažemo vmesnik za dodajanje respondentov global $lang; - echo '

'.$lang['srv_inv_add_recipients_heading'].'

'; echo '
'; $this->displayAddRecipientsView($fields, $recipients_list); @@ -560,12 +565,12 @@ class SurveyTelephone { # profili respondentov echo '
'; - echo '

'.$lang['srv_inv_recipient_select_list'].'

'; + echo '

'.$lang['srv_inv_recipient_select_list'].'

'; $this->listRecipientsProfiles(); echo '
'; # id=inv_recipients_profiles_holder - echo '
'; + echo '
'.$lang['srv_inv_recipiens_from'].''; $sqlSysMapping = sisplet_query("SELECT * FROM srv_invitations_mapping WHERE sid = '$this->sid'"); if (mysqli_num_rows($sqlSysMapping) > 0) { @@ -580,8 +585,6 @@ class SurveyTelephone { .($sysUserToAdd > 0 ? ' ('.$sysUserToAdd.')' : '').''; echo Help::display('inv_recipiens_from_system');*/ - echo '
'; - echo '
'; if ($import_type == 3) { #$this->displayFromSystemVariables(); $this->createSystemVariablesMapping(); @@ -605,6 +608,7 @@ class SurveyTelephone { echo ''; echo ''.$lang['srv_'.$field].''; echo ''; + if ($is_selected == 1) { $field_lang[] = $lang['srv_'.$field]; } @@ -618,12 +622,12 @@ class SurveyTelephone { echo '