Merge pull request #3231 from DanielBausset/statistics-weekdays
Analytics: number of QSOs for each day of the week
这个提交包含在:
		
						当前提交
						cfd880d479
					
				
					共有  20 个文件被更改,包括 382 次插入 和 184 次删除
				
			
		|  | @ -21,6 +21,7 @@ class Dayswithqso extends CI_Controller { | ||||||
|         $data['streaks'] = $this->dayswithqso_model->getLongestStreak(); |         $data['streaks'] = $this->dayswithqso_model->getLongestStreak(); | ||||||
|         $data['currentstreak'] = $this->dayswithqso_model->getCurrentStreak(); |         $data['currentstreak'] = $this->dayswithqso_model->getCurrentStreak(); | ||||||
|         $data['almostcurrentstreak'] = $this->dayswithqso_model->getAlmostCurrentStreak(); |         $data['almostcurrentstreak'] = $this->dayswithqso_model->getAlmostCurrentStreak(); | ||||||
|  |         $data['daysofweek'] = $this->dayswithqso_model->getDaysOfWeek(); | ||||||
| 
 | 
 | ||||||
|         $this->load->view('interface_assets/header', $data); |         $this->load->view('interface_assets/header', $data); | ||||||
|         $this->load->view('dayswithqso/index'); |         $this->load->view('dayswithqso/index'); | ||||||
|  | @ -38,4 +39,15 @@ class Dayswithqso extends CI_Controller { | ||||||
|         echo json_encode($data); |         echo json_encode($data); | ||||||
|     } |     } | ||||||
| 
 | 
 | ||||||
|  |     public function get_weekdays(){ | ||||||
|  | 
 | ||||||
|  |         //load model
 | ||||||
|  |         $this->load->model('dayswithqso_model'); | ||||||
|  | 
 | ||||||
|  |         // get data
 | ||||||
|  |         $data = $this->dayswithqso_model->getDaysOfWeek(); | ||||||
|  |         header('Content-Type: application/json'); | ||||||
|  |         echo json_encode($data); | ||||||
|  |     } | ||||||
|  | 
 | ||||||
| } | } | ||||||
|  | @ -55,8 +55,13 @@ $lang['statistics_timeline'] = "Timeline"; | ||||||
| * | * | ||||||
| */ | */ | ||||||
| 
 | 
 | ||||||
| $lang['statistics_days_with_qso'] = "Number of days with QSOs each year"; | $lang['statistics_tab_yearly'] = "Yearly"; | ||||||
| $lang['statistics_days_with_qso_short'] = "Days with QSOs"; | $lang['statistics_tab_streaks'] = "Streaks"; | ||||||
|  | $lang['statistics_tab_weekdays'] = "Days of the week"; | ||||||
|  | $lang['statistics_days_yearly'] = "Number of days with QSOs each year"; | ||||||
|  | $lang['statistics_days_with_qso'] = "Days with QSOs"; | ||||||
|  | $lang['statistics_weekdays_with_qso'] = "QSOs breakdown by day of the week"; | ||||||
|  | $lang['statistics_number_of_qsos_this_weekday'] = "Number of QSOs for this day of the week"; | ||||||
| $lang['statistics_dwq_longest_streak_in_log'] = "Longest streak with QSOs in the log"; | $lang['statistics_dwq_longest_streak_in_log'] = "Longest streak with QSOs in the log"; | ||||||
| $lang['statistics_dwq_longest_streak_in_log_hint'] = "A maximum of the 10 longest streaks are shown!"; | $lang['statistics_dwq_longest_streak_in_log_hint'] = "A maximum of the 10 longest streaks are shown!"; | ||||||
| $lang['statistics_dwq_streak_continuous_days'] = "Streak (continuous days with QSOs)"; | $lang['statistics_dwq_streak_continuous_days'] = "Streak (continuous days with QSOs)"; | ||||||
|  |  | ||||||
|  | @ -55,8 +55,13 @@ $lang['statistics_timeline'] = "时间线"; | ||||||
| * | * | ||||||
| */ | */ | ||||||
| 
 | 
 | ||||||
| $lang['statistics_days_with_qso'] = "本年QSO总数"; | $lang['statistics_tab_yearly'] = "Yearly"; | ||||||
| $lang['statistics_days_with_qso_short'] = "QSO的日期"; | $lang['statistics_tab_streaks'] = "Streaks"; | ||||||
|  | $lang['statistics_tab_weekdays'] = "Days of the week"; | ||||||
|  | $lang['statistics_days_yearly'] = "Number of days with QSOs each year"; | ||||||
|  | $lang['statistics_days_with_qso'] = "QSO的日期"; | ||||||
|  | $lang['statistics_weekdays_with_qso'] = "QSOs breakdown by day of the week"; | ||||||
|  | $lang['statistics_number_of_qsos_this_weekday'] = "Number of QSOs for this day of the week"; | ||||||
| $lang['statistics_dwq_longest_streak_in_log'] = "日志中最长QSO连续记录"; | $lang['statistics_dwq_longest_streak_in_log'] = "日志中最长QSO连续记录"; | ||||||
| $lang['statistics_dwq_longest_streak_in_log_hint'] = "最多显示10条最长QSO连续记录"; | $lang['statistics_dwq_longest_streak_in_log_hint'] = "最多显示10条最长QSO连续记录"; | ||||||
| $lang['statistics_dwq_streak_continuous_days'] = "最长QSO连续记录"; | $lang['statistics_dwq_streak_continuous_days'] = "最长QSO连续记录"; | ||||||
|  |  | ||||||
|  | @ -55,8 +55,13 @@ $lang['statistics_timeline'] = "Timeline"; | ||||||
| * | * | ||||||
| */ | */ | ||||||
| 
 | 
 | ||||||
| $lang['statistics_days_with_qso'] = "Number of days with QSOs each year"; | $lang['statistics_tab_yearly'] = "Yearly"; | ||||||
| $lang['statistics_days_with_qso_short'] = "Days with QSOs"; | $lang['statistics_tab_streaks'] = "Streaks"; | ||||||
|  | $lang['statistics_tab_weekdays'] = "Days of the week"; | ||||||
|  | $lang['statistics_days_yearly'] = "Number of days with QSOs each year"; | ||||||
|  | $lang['statistics_days_with_qso'] = "Days with QSOs"; | ||||||
|  | $lang['statistics_weekdays_with_qso'] = "QSOs breakdown by day of the week"; | ||||||
|  | $lang['statistics_number_of_qsos_this_weekday'] = "Number of QSOs for this day of the week"; | ||||||
| $lang['statistics_dwq_longest_streak_in_log'] = "Longest streak with QSOs in the log"; | $lang['statistics_dwq_longest_streak_in_log'] = "Longest streak with QSOs in the log"; | ||||||
| $lang['statistics_dwq_longest_streak_in_log_hint'] = "A maximum of the 10 longest streaks are shown!"; | $lang['statistics_dwq_longest_streak_in_log_hint'] = "A maximum of the 10 longest streaks are shown!"; | ||||||
| $lang['statistics_dwq_streak_continuous_days'] = "Streak (continuous days with QSOs)"; | $lang['statistics_dwq_streak_continuous_days'] = "Streak (continuous days with QSOs)"; | ||||||
|  |  | ||||||
|  | @ -54,8 +54,13 @@ $lang['statistics_timeline'] = "Timeline"; | ||||||
| * | * | ||||||
| */ | */ | ||||||
| 
 | 
 | ||||||
| $lang['statistics_days_with_qso'] = "Number of days with QSOs each year"; | $lang['statistics_tab_yearly'] = "Yearly"; | ||||||
| $lang['statistics_days_with_qso_short'] = "Days with QSOs"; | $lang['statistics_tab_streaks'] = "Streaks"; | ||||||
|  | $lang['statistics_tab_weekdays'] = "Days of the week"; | ||||||
|  | $lang['statistics_days_yearly'] = "Number of days with QSOs each year"; | ||||||
|  | $lang['statistics_days_with_qso'] = "Days with QSOs"; | ||||||
|  | $lang['statistics_weekdays_with_qso'] = "QSOs breakdown by day of the week"; | ||||||
|  | $lang['statistics_number_of_qsos_this_weekday'] = "Number of QSOs for this day of the week"; | ||||||
| $lang['statistics_dwq_longest_streak_in_log'] = "Longest streak with QSOs in the log"; | $lang['statistics_dwq_longest_streak_in_log'] = "Longest streak with QSOs in the log"; | ||||||
| $lang['statistics_dwq_longest_streak_in_log_hint'] = "A maximum of the 10 longest streaks are shown!"; | $lang['statistics_dwq_longest_streak_in_log_hint'] = "A maximum of the 10 longest streaks are shown!"; | ||||||
| $lang['statistics_dwq_streak_continuous_days'] = "Streak (continuous days with QSOs)"; | $lang['statistics_dwq_streak_continuous_days'] = "Streak (continuous days with QSOs)"; | ||||||
|  |  | ||||||
|  | @ -55,8 +55,13 @@ $lang['statistics_timeline'] = "Timeline"; | ||||||
| * | * | ||||||
| */ | */ | ||||||
| 
 | 
 | ||||||
| $lang['statistics_days_with_qso'] = "Number of days with QSOs each year"; | $lang['statistics_tab_yearly'] = "Yearly"; | ||||||
| $lang['statistics_days_with_qso_short'] = "Days with QSOs"; | $lang['statistics_tab_streaks'] = "Streaks"; | ||||||
|  | $lang['statistics_tab_weekdays'] = "Days of the week"; | ||||||
|  | $lang['statistics_days_yearly'] = "Number of days with QSOs each year"; | ||||||
|  | $lang['statistics_days_with_qso'] = "Days with QSOs"; | ||||||
|  | $lang['statistics_weekdays_with_qso'] = "QSOs breakdown by day of the week"; | ||||||
|  | $lang['statistics_number_of_qsos_this_weekday'] = "Number of QSOs for this day of the week"; | ||||||
| $lang['statistics_dwq_longest_streak_in_log'] = "Longest streak with QSOs in the log"; | $lang['statistics_dwq_longest_streak_in_log'] = "Longest streak with QSOs in the log"; | ||||||
| $lang['statistics_dwq_longest_streak_in_log_hint'] = "A maximum of the 10 longest streaks are shown!"; | $lang['statistics_dwq_longest_streak_in_log_hint'] = "A maximum of the 10 longest streaks are shown!"; | ||||||
| $lang['statistics_dwq_streak_continuous_days'] = "Streak (continuous days with QSOs)"; | $lang['statistics_dwq_streak_continuous_days'] = "Streak (continuous days with QSOs)"; | ||||||
|  | @ -64,4 +69,3 @@ $lang['statistics_dwq_current_streak_in_log'] = "Current streak with QSOs in the | ||||||
| $lang['statistics_dwq_current_streak_continuous_days'] = "Current streak (continuous days with QSOs)"; | $lang['statistics_dwq_current_streak_continuous_days'] = "Current streak (continuous days with QSOs)"; | ||||||
| $lang['statistics_dwq_make_qso_to_extend_streak'] = "If you make a QSO today, you can continue to extend your streak... or else your current streak will be broken!"; | $lang['statistics_dwq_make_qso_to_extend_streak'] = "If you make a QSO today, you can continue to extend your streak... or else your current streak will be broken!"; | ||||||
| $lang['statistics_dwq_no_current_streak'] = "No current streak found!"; | $lang['statistics_dwq_no_current_streak'] = "No current streak found!"; | ||||||
| 
 |  | ||||||
|  |  | ||||||
|  | @ -55,8 +55,13 @@ $lang['statistics_timeline'] = "Timeline"; | ||||||
| * | * | ||||||
| */ | */ | ||||||
| 
 | 
 | ||||||
| $lang['statistics_days_with_qso'] = "Number of days with QSOs each year"; | $lang['statistics_tab_yearly'] = "Yearly"; | ||||||
| $lang['statistics_days_with_qso_short'] = "Days with QSOs"; | $lang['statistics_tab_streaks'] = "Streaks"; | ||||||
|  | $lang['statistics_tab_weekdays'] = "Days of the week"; | ||||||
|  | $lang['statistics_days_yearly'] = "Number of days with QSOs each year"; | ||||||
|  | $lang['statistics_days_with_qso'] = "Days with QSOs"; | ||||||
|  | $lang['statistics_weekdays_with_qso'] = "QSOs breakdown by day of the week"; | ||||||
|  | $lang['statistics_number_of_qsos_this_weekday'] = "Number of QSOs for this day of the week"; | ||||||
| $lang['statistics_dwq_longest_streak_in_log'] = "Longest streak with QSOs in the log"; | $lang['statistics_dwq_longest_streak_in_log'] = "Longest streak with QSOs in the log"; | ||||||
| $lang['statistics_dwq_longest_streak_in_log_hint'] = "A maximum of the 10 longest streaks are shown!"; | $lang['statistics_dwq_longest_streak_in_log_hint'] = "A maximum of the 10 longest streaks are shown!"; | ||||||
| $lang['statistics_dwq_streak_continuous_days'] = "Streak (continuous days with QSOs)"; | $lang['statistics_dwq_streak_continuous_days'] = "Streak (continuous days with QSOs)"; | ||||||
|  |  | ||||||
|  | @ -50,8 +50,8 @@ $lang['general_word_city'] = "Ville"; | ||||||
| $lang['general_word_total'] = "Total"; | $lang['general_word_total'] = "Total"; | ||||||
| $lang['general_word_year'] = "Année"; | $lang['general_word_year'] = "Année"; | ||||||
| $lang['general_word_month'] = "Mois"; | $lang['general_word_month'] = "Mois"; | ||||||
| $lang['general_word_day'] = "Day"; | $lang['general_word_day'] = "Jour"; | ||||||
| $lang['general_word_days'] = "Days"; | $lang['general_word_days'] = "Jours"; | ||||||
| 
 | 
 | ||||||
| $lang['general_word_colors'] = "Couleurs"; | $lang['general_word_colors'] = "Couleurs"; | ||||||
| $lang['general_word_light'] = "Lumière/Laser"; | $lang['general_word_light'] = "Lumière/Laser"; | ||||||
|  |  | ||||||
|  | @ -55,13 +55,17 @@ $lang['statistics_timeline'] = "Chronologie"; | ||||||
| * | * | ||||||
| */ | */ | ||||||
| 
 | 
 | ||||||
| $lang['statistics_days_with_qso'] = "Number of days with QSOs each year"; | $lang['statistics_tab_yearly'] = "Statistiques annuelles"; | ||||||
| $lang['statistics_days_with_qso_short'] = "Days with QSOs"; | $lang['statistics_tab_streaks'] = "Séries de jours"; | ||||||
| $lang['statistics_dwq_longest_streak_in_log'] = "Longest streak with QSOs in the log"; | $lang['statistics_tab_weekdays'] = "Jours de la semaine"; | ||||||
| $lang['statistics_dwq_longest_streak_in_log_hint'] = "A maximum of the 10 longest streaks are shown!"; | $lang['statistics_days_yearly'] = "Nombre de jours avec des QSOs par année"; | ||||||
| $lang['statistics_dwq_streak_continuous_days'] = "Streak (continuous days with QSOs)"; | $lang['statistics_days_with_qso'] = "Jours avec des QSOs"; | ||||||
| $lang['statistics_dwq_current_streak_in_log'] = "Current streak with QSOs in the log"; | $lang['statistics_weekdays_with_qso'] = "QSOs par jour de la semaine"; | ||||||
| $lang['statistics_dwq_current_streak_continuous_days'] = "Current streak (continuous days with QSOs)"; | $lang['statistics_number_of_qsos_this_weekday'] = "Nombre de QSOs pour ce jour de la semaine"; | ||||||
| $lang['statistics_dwq_make_qso_to_extend_streak'] = "If you make a QSO today, you can continue to extend your streak... or else your current streak will be broken!"; | $lang['statistics_dwq_longest_streak_in_log'] = "Plus longue série de jours avec des QSOs"; | ||||||
| $lang['statistics_dwq_no_current_streak'] = "No current streak found!"; | $lang['statistics_dwq_longest_streak_in_log_hint'] = "Seules les 10 plus longues séries sont affichées"; | ||||||
| 
 | $lang['statistics_dwq_streak_continuous_days'] = "Série (jours consécutifs avec des QSOs)"; | ||||||
|  | $lang['statistics_dwq_current_streak_in_log'] = "Série en cours"; | ||||||
|  | $lang['statistics_dwq_current_streak_continuous_days'] = "Série en cours (jours consécutifs avec des QSOs)"; | ||||||
|  | $lang['statistics_dwq_make_qso_to_extend_streak'] = "Si vous faites un QSO aujourd'hui, vous pouvez continuer la série en cours... sinon elle sera perdue !"; | ||||||
|  | $lang['statistics_dwq_no_current_streak'] = "Aucune série en cours !"; | ||||||
|  |  | ||||||
|  | @ -55,8 +55,13 @@ $lang['statistics_timeline'] = "Zeitleiste"; | ||||||
| * | * | ||||||
| */ | */ | ||||||
| 
 | 
 | ||||||
| $lang['statistics_days_with_qso'] = "Anzahl der Tage mit QSOs pro Jahr"; | $lang['statistics_tab_yearly'] = "Yearly"; | ||||||
| $lang['statistics_days_with_qso_short'] = "Tage mit QSOs"; | $lang['statistics_tab_streaks'] = "Streaks"; | ||||||
|  | $lang['statistics_tab_weekdays'] = "Days of the week"; | ||||||
|  | $lang['statistics_days_yearly'] = "Number of days with QSOs each year"; | ||||||
|  | $lang['statistics_days_with_qso'] = "Tage mit QSOs"; | ||||||
|  | $lang['statistics_weekdays_with_qso'] = "QSOs breakdown by day of the week"; | ||||||
|  | $lang['statistics_number_of_qsos_this_weekday'] = "Number of QSOs for this day of the week"; | ||||||
| $lang['statistics_dwq_longest_streak_in_log'] = "Längste Serie mit QSOs im Logbuch"; | $lang['statistics_dwq_longest_streak_in_log'] = "Längste Serie mit QSOs im Logbuch"; | ||||||
| $lang['statistics_dwq_longest_streak_in_log_hint'] = "Es werden maximal die 10 längsten Serien angezeigt!"; | $lang['statistics_dwq_longest_streak_in_log_hint'] = "Es werden maximal die 10 längsten Serien angezeigt!"; | ||||||
| $lang['statistics_dwq_streak_continuous_days'] = "Serie (fortlaufende Tage mit QSOs)"; | $lang['statistics_dwq_streak_continuous_days'] = "Serie (fortlaufende Tage mit QSOs)"; | ||||||
|  |  | ||||||
|  | @ -55,8 +55,13 @@ $lang['statistics_timeline'] = "Timeline"; | ||||||
| * | * | ||||||
| */ | */ | ||||||
| 
 | 
 | ||||||
| $lang['statistics_days_with_qso'] = "Number of days with QSOs each year"; | $lang['statistics_tab_yearly'] = "Yearly"; | ||||||
| $lang['statistics_days_with_qso_short'] = "Days with QSOs"; | $lang['statistics_tab_streaks'] = "Streaks"; | ||||||
|  | $lang['statistics_tab_weekdays'] = "Days of the week"; | ||||||
|  | $lang['statistics_days_yearly'] = "Number of days with QSOs each year"; | ||||||
|  | $lang['statistics_days_with_qso'] = "Days with QSOs"; | ||||||
|  | $lang['statistics_weekdays_with_qso'] = "QSOs breakdown by day of the week"; | ||||||
|  | $lang['statistics_number_of_qsos_this_weekday'] = "Number of QSOs for this day of the week"; | ||||||
| $lang['statistics_dwq_longest_streak_in_log'] = "Longest streak with QSOs in the log"; | $lang['statistics_dwq_longest_streak_in_log'] = "Longest streak with QSOs in the log"; | ||||||
| $lang['statistics_dwq_longest_streak_in_log_hint'] = "A maximum of the 10 longest streaks are shown!"; | $lang['statistics_dwq_longest_streak_in_log_hint'] = "A maximum of the 10 longest streaks are shown!"; | ||||||
| $lang['statistics_dwq_streak_continuous_days'] = "Streak (continuous days with QSOs)"; | $lang['statistics_dwq_streak_continuous_days'] = "Streak (continuous days with QSOs)"; | ||||||
|  |  | ||||||
|  | @ -55,8 +55,13 @@ $lang['statistics_timeline'] = "Sequenza temporale"; | ||||||
| * | * | ||||||
| */ | */ | ||||||
| 
 | 
 | ||||||
| $lang['statistics_days_with_qso'] = "Numero di giorni con QSO ogni anno"; | $lang['statistics_tab_yearly'] = "Yearly"; | ||||||
| $lang['statistics_days_with_qso_short'] = "Giorni con QSO"; | $lang['statistics_tab_streaks'] = "Streaks"; | ||||||
|  | $lang['statistics_tab_weekdays'] = "Days of the week"; | ||||||
|  | $lang['statistics_days_yearly'] = "Number of days with QSOs each year"; | ||||||
|  | $lang['statistics_days_with_qso'] = "Giorni con QSO"; | ||||||
|  | $lang['statistics_weekdays_with_qso'] = "QSOs breakdown by day of the week"; | ||||||
|  | $lang['statistics_number_of_qsos_this_weekday'] = "Number of QSOs for this day of the week"; | ||||||
| $lang['statistics_dwq_longest_streak_in_log'] = "Serie più lunga di QSO nel log"; | $lang['statistics_dwq_longest_streak_in_log'] = "Serie più lunga di QSO nel log"; | ||||||
| $lang['statistics_dwq_longest_streak_in_log_hint'] = "Vengono mostrate al massimo le 10 serie più lunghe!"; | $lang['statistics_dwq_longest_streak_in_log_hint'] = "Vengono mostrate al massimo le 10 serie più lunghe!"; | ||||||
| $lang['statistics_dwq_streak_continuous_days'] = "Streak (giorni continui con QSO)"; | $lang['statistics_dwq_streak_continuous_days'] = "Streak (giorni continui con QSO)"; | ||||||
|  |  | ||||||
|  | @ -55,8 +55,13 @@ $lang['statistics_timeline'] = "Timeline"; | ||||||
| * | * | ||||||
| */ | */ | ||||||
| 
 | 
 | ||||||
| $lang['statistics_days_with_qso'] = "Number of days with QSOs each year"; | $lang['statistics_tab_yearly'] = "Yearly"; | ||||||
| $lang['statistics_days_with_qso_short'] = "Days with QSOs"; | $lang['statistics_tab_streaks'] = "Streaks"; | ||||||
|  | $lang['statistics_tab_weekdays'] = "Days of the week"; | ||||||
|  | $lang['statistics_days_yearly'] = "Number of days with QSOs each year"; | ||||||
|  | $lang['statistics_days_with_qso'] = "Days with QSOs"; | ||||||
|  | $lang['statistics_weekdays_with_qso'] = "QSOs breakdown by day of the week"; | ||||||
|  | $lang['statistics_number_of_qsos_this_weekday'] = "Number of QSOs for this day of the week"; | ||||||
| $lang['statistics_dwq_longest_streak_in_log'] = "Longest streak with QSOs in the log"; | $lang['statistics_dwq_longest_streak_in_log'] = "Longest streak with QSOs in the log"; | ||||||
| $lang['statistics_dwq_longest_streak_in_log_hint'] = "A maximum of the 10 longest streaks are shown!"; | $lang['statistics_dwq_longest_streak_in_log_hint'] = "A maximum of the 10 longest streaks are shown!"; | ||||||
| $lang['statistics_dwq_streak_continuous_days'] = "Streak (continuous days with QSOs)"; | $lang['statistics_dwq_streak_continuous_days'] = "Streak (continuous days with QSOs)"; | ||||||
|  |  | ||||||
|  | @ -55,8 +55,13 @@ $lang['statistics_timeline'] = "Лента времени"; | ||||||
| * | * | ||||||
| */ | */ | ||||||
| 
 | 
 | ||||||
| $lang['statistics_days_with_qso'] = "Количество дней с QSO в каждом году"; | $lang['statistics_tab_yearly'] = "Yearly"; | ||||||
| $lang['statistics_days_with_qso_short'] = "Дней с QSO"; | $lang['statistics_tab_streaks'] = "Streaks"; | ||||||
|  | $lang['statistics_tab_weekdays'] = "Days of the week"; | ||||||
|  | $lang['statistics_days_yearly'] = "Number of days with QSOs each year"; | ||||||
|  | $lang['statistics_days_with_qso'] = "Дней с QSO"; | ||||||
|  | $lang['statistics_weekdays_with_qso'] = "QSOs breakdown by day of the week"; | ||||||
|  | $lang['statistics_number_of_qsos_this_weekday'] = "Number of QSOs for this day of the week"; | ||||||
| $lang['statistics_dwq_longest_streak_in_log'] = "Самый длинный интервал дней с QSO в журнале"; | $lang['statistics_dwq_longest_streak_in_log'] = "Самый длинный интервал дней с QSO в журнале"; | ||||||
| $lang['statistics_dwq_longest_streak_in_log_hint'] = "Отображаются 10 самых длинных интервалов!"; | $lang['statistics_dwq_longest_streak_in_log_hint'] = "Отображаются 10 самых длинных интервалов!"; | ||||||
| $lang['statistics_dwq_streak_continuous_days'] = "Интервал (непрерывных дней с QSO)"; | $lang['statistics_dwq_streak_continuous_days'] = "Интервал (непрерывных дней с QSO)"; | ||||||
|  |  | ||||||
|  | @ -55,8 +55,13 @@ $lang['statistics_timeline'] = "Línea de tiempo"; | ||||||
| * | * | ||||||
| */ | */ | ||||||
| 
 | 
 | ||||||
| $lang['statistics_days_with_qso'] = "Número de días con QSOs en cada año"; | $lang['statistics_tab_yearly'] = "Yearly"; | ||||||
| $lang['statistics_days_with_qso_short'] = "Días con QSOs"; | $lang['statistics_tab_streaks'] = "Streaks"; | ||||||
|  | $lang['statistics_tab_weekdays'] = "Days of the week"; | ||||||
|  | $lang['statistics_days_yearly'] = "Number of days with QSOs each year"; | ||||||
|  | $lang['statistics_days_with_qso'] = "Días con QSOs"; | ||||||
|  | $lang['statistics_weekdays_with_qso'] = "QSOs breakdown by day of the week"; | ||||||
|  | $lang['statistics_number_of_qsos_this_weekday'] = "Number of QSOs for this day of the week"; | ||||||
| $lang['statistics_dwq_longest_streak_in_log'] = "Mayor racha de QSOs en el libro"; | $lang['statistics_dwq_longest_streak_in_log'] = "Mayor racha de QSOs en el libro"; | ||||||
| $lang['statistics_dwq_longest_streak_in_log_hint'] = "¡Se muestra un máximo de 10 rachas más largas!"; | $lang['statistics_dwq_longest_streak_in_log_hint'] = "¡Se muestra un máximo de 10 rachas más largas!"; | ||||||
| $lang['statistics_dwq_streak_continuous_days'] = "Racha (días continuos con QSOs)"; | $lang['statistics_dwq_streak_continuous_days'] = "Racha (días continuos con QSOs)"; | ||||||
|  |  | ||||||
|  | @ -55,8 +55,13 @@ $lang['statistics_timeline'] = "Timeline"; | ||||||
| * | * | ||||||
| */ | */ | ||||||
| 
 | 
 | ||||||
| $lang['statistics_days_with_qso'] = "Number of days with QSOs each year"; | $lang['statistics_tab_yearly'] = "Yearly"; | ||||||
| $lang['statistics_days_with_qso_short'] = "Days with QSOs"; | $lang['statistics_tab_streaks'] = "Streaks"; | ||||||
|  | $lang['statistics_tab_weekdays'] = "Days of the week"; | ||||||
|  | $lang['statistics_days_yearly'] = "Number of days with QSOs each year"; | ||||||
|  | $lang['statistics_days_with_qso'] = "Days with QSOs"; | ||||||
|  | $lang['statistics_weekdays_with_qso'] = "QSOs breakdown by day of the week"; | ||||||
|  | $lang['statistics_number_of_qsos_this_weekday'] = "Number of QSOs for this day of the week"; | ||||||
| $lang['statistics_dwq_longest_streak_in_log'] = "Longest streak with QSOs in the log"; | $lang['statistics_dwq_longest_streak_in_log'] = "Longest streak with QSOs in the log"; | ||||||
| $lang['statistics_dwq_longest_streak_in_log_hint'] = "A maximum of the 10 longest streaks are shown!"; | $lang['statistics_dwq_longest_streak_in_log_hint'] = "A maximum of the 10 longest streaks are shown!"; | ||||||
| $lang['statistics_dwq_streak_continuous_days'] = "Streak (continuous days with QSOs)"; | $lang['statistics_dwq_streak_continuous_days'] = "Streak (continuous days with QSOs)"; | ||||||
|  |  | ||||||
|  | @ -55,8 +55,13 @@ $lang['statistics_timeline'] = "Zaman Çizelgesi"; | ||||||
| * | * | ||||||
| */ | */ | ||||||
| 
 | 
 | ||||||
| $lang['statistics_days_with_qso'] = "Her yıl QSO'ların olduğu gün sayısı"; | $lang['statistics_tab_yearly'] = "Yearly"; | ||||||
| $lang['statistics_days_with_qso_short'] = "QSO'lu Günler"; | $lang['statistics_tab_streaks'] = "Streaks"; | ||||||
|  | $lang['statistics_tab_weekdays'] = "Days of the week"; | ||||||
|  | $lang['statistics_days_yearly'] = "Number of days with QSOs each year"; | ||||||
|  | $lang['statistics_days_with_qso'] = "QSO'lu Günler"; | ||||||
|  | $lang['statistics_weekdays_with_qso'] = "QSOs breakdown by day of the week"; | ||||||
|  | $lang['statistics_number_of_qsos_this_weekday'] = "Number of QSOs for this day of the week"; | ||||||
| $lang['statistics_dwq_longest_streak_in_log'] = "Günlükteki QSO'larla en uzun seri"; | $lang['statistics_dwq_longest_streak_in_log'] = "Günlükteki QSO'larla en uzun seri"; | ||||||
| $lang['statistics_dwq_longest_streak_in_log_hint'] = "Maksimum en uzun 10 seri gösteriliyor!"; | $lang['statistics_dwq_longest_streak_in_log_hint'] = "Maksimum en uzun 10 seri gösteriliyor!"; | ||||||
| $lang['statistics_dwq_streak_continuous_days'] = "Seri (QSO'larla sürekli günler)"; | $lang['statistics_dwq_streak_continuous_days'] = "Seri (QSO'larla sürekli günler)"; | ||||||
|  |  | ||||||
|  | @ -180,4 +180,27 @@ class Dayswithqso_model extends CI_Model | ||||||
|         return $query->result(); |         return $query->result(); | ||||||
|     } |     } | ||||||
| 
 | 
 | ||||||
|  |     /* | ||||||
|  |      * Returns the total number of QSOs made for each day of the week (Monday to Sunday) | ||||||
|  |      */ | ||||||
|  |     function getDaysOfWeek() | ||||||
|  |     { | ||||||
|  | 		$CI =& get_instance(); | ||||||
|  | 		$CI->load->model('logbooks_model'); | ||||||
|  | 		$logbooks_locations_array = $CI->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook')); | ||||||
|  | 
 | ||||||
|  |         if (!$logbooks_locations_array) { | ||||||
|  |             return null; | ||||||
|  |         } | ||||||
|  | 
 | ||||||
|  | 		$location_list = "'".implode("','",$logbooks_locations_array)."'"; | ||||||
|  | 
 | ||||||
|  |         $sql = "SELECT DAYNAME(col_time_off) AS weekday, COUNT(*) AS qsos FROM " . $this->config->item('table_name') | ||||||
|  |               . " WHERE WEEKDAY(col_time_off) BETWEEN 0 AND 6 AND station_id in (" . $location_list . ")" | ||||||
|  |               . " GROUP BY weekday ORDER BY FIELD(weekday, 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday', 'Sunday')"; | ||||||
|  | 
 | ||||||
|  |         $query = $this->db->query($sql); | ||||||
|  | 
 | ||||||
|  |         return $query->result(); | ||||||
|  |     } | ||||||
| } | } | ||||||
|  |  | ||||||
|  | @ -1,13 +1,32 @@ | ||||||
| <script> | <script> | ||||||
|     var lang_days_with_qso_short = "<?php echo lang('statistics_days_with_qso_short'); ?>"; |     var lang_days_with_qso = "<?php echo lang('statistics_days_with_qso'); ?>"; | ||||||
|  |     var lang_qsos_this_weekday = "<?php echo lang('statistics_number_of_qsos_this_weekday'); ?>"; | ||||||
| </script> | </script> | ||||||
| 
 | 
 | ||||||
| <div class="container"> | <div class="container"> | ||||||
| 
 |  | ||||||
|     <br> |     <br> | ||||||
| 
 |  | ||||||
|     <h2><?php echo $page_title; ?></h2>
 |     <h2><?php echo $page_title; ?></h2>
 | ||||||
| 
 | 
 | ||||||
|  |     <br> | ||||||
|  | 	<div class="tabs"> | ||||||
|  | 		<ul class="nav nav-tabs" id="myTab" role="tablist"> | ||||||
|  | 			<li class="nav-item"> | ||||||
|  | 				<a class="nav-link active" id="home-tab" data-bs-toggle="tab" href="#home" role="tab" aria-controls="home" aria-selected="true"><?php echo lang('statistics_tab_yearly'); ?></a>
 | ||||||
|  | 			</li> | ||||||
|  | 			<li class="nav-item"> | ||||||
|  | 				<a class="nav-link" id="daysofweek-tab" data-bs-toggle="tab" href="#daysofweek" role="tab" aria-controls="daysofweek" aria-selected="false"><?php echo lang('statistics_tab_weekdays'); ?></a>
 | ||||||
|  | 			</li> | ||||||
|  | 			<li class="nav-item"> | ||||||
|  | 				<a class="nav-link" id="streaks-tab" data-bs-toggle="tab" href="#streaks" role="tab" aria-controls="streaks" aria-selected="false"><?php echo lang('statistics_tab_streaks'); ?></a>
 | ||||||
|  | 			</li> | ||||||
|  | 		</ul> | ||||||
|  | 	</div> | ||||||
|  | 
 | ||||||
|  |     <div class="tab-content" id="myTabContent"> | ||||||
|  |         <div class="tab-pane fade show active" id="home" role="tabpanel" aria-labelledby="home-tab"> | ||||||
|  |             <br/> | ||||||
|  |             <h3><?php echo lang('statistics_days_yearly'); ?></h3>
 | ||||||
|  |             <br/> | ||||||
|             <?php |             <?php | ||||||
|             if (is_array($result)) { |             if (is_array($result)) { | ||||||
|             echo '<div id="diffDays" class="table-responsive"><table class="qsotable table table-sm table-bordered table-hover table-striped table-condensed">'; |             echo '<div id="diffDays" class="table-responsive"><table class="qsotable table table-sm table-bordered table-hover table-striped table-condensed">'; | ||||||
|  | @ -34,7 +53,17 @@ | ||||||
|             } |             } | ||||||
|             ?>
 |             ?>
 | ||||||
|             <canvas id="myChartDiff" width="400" height="150"></canvas> |             <canvas id="myChartDiff" width="400" height="150"></canvas> | ||||||
|     <h2><?php echo lang('statistics_dwq_longest_streak_in_log'); ?></h2>
 |         </div> | ||||||
|  | 
 | ||||||
|  |         <div class="tab-pane fade" id="daysofweek" role="tabpanel" aria-labelledby="daysofweek-tab"> | ||||||
|  |             <br/> | ||||||
|  |             <h3><?php echo lang('statistics_weekdays_with_qso'); ?></h3>
 | ||||||
|  |             <canvas id="weekdaysChart" width="400" height="150"></canvas> | ||||||
|  |         </div> | ||||||
|  | 
 | ||||||
|  |         <div class="tab-pane fade" id="streaks" role="tabpanel" aria-labelledby="streaks-tab"> | ||||||
|  |             <br/> | ||||||
|  |             <h3><?php echo lang('statistics_dwq_longest_streak_in_log'); ?></h3>
 | ||||||
|             <p><?php echo lang('statistics_dwq_longest_streak_in_log_hint'); ?></p>
 |             <p><?php echo lang('statistics_dwq_longest_streak_in_log_hint'); ?></p>
 | ||||||
| 
 | 
 | ||||||
|             <?php  |             <?php  | ||||||
|  | @ -75,7 +104,7 @@ | ||||||
|             } |             } | ||||||
|             ?>
 |             ?>
 | ||||||
| 
 | 
 | ||||||
|     <h2><?php echo lang('statistics_dwq_current_streak_in_log'); ?></h2>
 |             <h3><?php echo lang('statistics_dwq_current_streak_in_log'); ?></h3>
 | ||||||
|             <?php |             <?php | ||||||
|             if (is_array($currentstreak)) { |             if (is_array($currentstreak)) { | ||||||
|                 echo '<div id="streaks" class="table-responsive"><table class="qsotable table table-sm table-bordered table-hover table-striped table-condensed">'; |                 echo '<div id="streaks" class="table-responsive"><table class="qsotable table table-sm table-bordered table-hover table-striped table-condensed">'; | ||||||
|  | @ -123,3 +152,5 @@ | ||||||
|             } |             } | ||||||
|             ?>
 |             ?>
 | ||||||
|         </div> |         </div> | ||||||
|  |     </div> | ||||||
|  | </div> | ||||||
|  |  | ||||||
|  | @ -1,3 +1,7 @@ | ||||||
|  | daysPerYear(); | ||||||
|  | weekDays(); | ||||||
|  | 
 | ||||||
|  | function daysPerYear() { | ||||||
| 	$.ajax({ | 	$.ajax({ | ||||||
| 		url: base_url + 'index.php/dayswithqso/get_days', | 		url: base_url + 'index.php/dayswithqso/get_days', | ||||||
| 		success: function (data) { | 		success: function (data) { | ||||||
|  | @ -15,7 +19,7 @@ $.ajax({ | ||||||
| 					data: { | 					data: { | ||||||
| 						labels: labels, | 						labels: labels, | ||||||
| 						datasets: [{ | 						datasets: [{ | ||||||
| 						label: lang_days_with_qso_short, | 							label: lang_days_with_qso, | ||||||
| 							data: dataDxcc, | 							data: dataDxcc, | ||||||
| 							backgroundColor: 'rgba(54, 162, 235, 0.2)', | 							backgroundColor: 'rgba(54, 162, 235, 0.2)', | ||||||
| 							borderColor: 'rgba(54, 162, 235, 1)', | 							borderColor: 'rgba(54, 162, 235, 1)', | ||||||
|  | @ -49,3 +53,58 @@ $.ajax({ | ||||||
| 			} | 			} | ||||||
| 		} | 		} | ||||||
| 	}); | 	}); | ||||||
|  | } | ||||||
|  | 
 | ||||||
|  | function weekDays() { | ||||||
|  | 	$.ajax({ | ||||||
|  | 		url: base_url + 'index.php/dayswithqso/get_weekdays', | ||||||
|  | 		success: function (data) { | ||||||
|  | 			if ($.trim(data)) { | ||||||
|  | 				var labels = []; | ||||||
|  | 				var dataDays = []; | ||||||
|  | 				$.each(data, function () { | ||||||
|  | 					labels.push(this.weekday); | ||||||
|  | 					dataDays.push(this.qsos); | ||||||
|  | 				}); | ||||||
|  | 				var ctx = document.getElementById("weekdaysChart").getContext('2d'); | ||||||
|  | 				var color = ifDarkModeThemeReturn('white', 'grey'); | ||||||
|  | 				var myChart = new Chart(ctx, { | ||||||
|  | 					type: 'bar', | ||||||
|  | 					data: { | ||||||
|  | 						labels: labels, | ||||||
|  | 						datasets: [{ | ||||||
|  | 							label: lang_qsos_this_weekday, | ||||||
|  | 							data: dataDays, | ||||||
|  | 							backgroundColor: 'rgba(54, 162, 235, 0.2)', | ||||||
|  | 							borderColor: 'rgba(54, 162, 235, 1)', | ||||||
|  | 							borderWidth: 2, | ||||||
|  | 							color: color | ||||||
|  | 						}] | ||||||
|  | 					}, | ||||||
|  | 					options: { | ||||||
|  | 						scales: { | ||||||
|  | 							y: { | ||||||
|  | 								ticks: { | ||||||
|  | 									beginAtZero: true, | ||||||
|  | 									color: color | ||||||
|  | 								} | ||||||
|  | 							}, | ||||||
|  | 							x: { | ||||||
|  | 								ticks: { | ||||||
|  | 									color: color | ||||||
|  | 								} | ||||||
|  | 							} | ||||||
|  | 						}, | ||||||
|  | 						plugins: { | ||||||
|  | 							legend: { | ||||||
|  | 								labels: { | ||||||
|  | 									color: color | ||||||
|  | 								} | ||||||
|  | 							} | ||||||
|  | 						} | ||||||
|  | 					} | ||||||
|  | 				}); | ||||||
|  | 			} | ||||||
|  | 		} | ||||||
|  | 	}); | ||||||
|  | } | ||||||
|  |  | ||||||
		正在加载…
	
		在新工单中引用