Skip to content

Commit 18824ed

Browse files
FromSunNewsFromSunNews
authored
Merge pull request #16 from phapdev/display_headbook
Display and search with condition
2 parents f1c9f2e + 3bd31a4 commit 18824ed

File tree

3 files changed

+108
-43
lines changed

3 files changed

+108
-43
lines changed

‎modules/manageheadbook/admin/headbook.php‎

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
$page_title = $lang_module['manage_headbook'];
2323

24-
$xtpl = new XTemplate('manageheadbook.tpl', NV_ROOTDIR . '/themes/' . $global_config['module_theme'] . '/modules/' . $module_file);
24+
$xtpl = new XTemplate('headbook.tpl', NV_ROOTDIR . '/themes/' . $global_config['module_theme'] . '/modules/' . $module_file);
2525
$xtpl->assign('LANG', $lang_module);
2626
$xtpl->assign('GLANG', $lang_global);
2727
$xtpl->assign('NV_BASE_ADMINURL', NV_BASE_ADMINURL);
@@ -30,22 +30,22 @@
3030
$xtpl->assign('MODULE_NAME', $module_name);
3131
$xtpl->assign('OP', $op);
3232

33-
$xtpl->assign('ma_nam_hoc', $ma_nam_hoc_get);
34-
$xtpl->assign('ma_tuan', $ma_tuan_get);
35-
$xtpl->assign('ma_lop', $ma_lop_get);
36-
$xtpl->assign('ma_buoi', $ma_buoi_get);
33+
$xtpl->assign('MANAMHOC', $ma_nam_hoc_get);
34+
$xtpl->assign('MATUAN', $ma_tuan_get);
35+
$xtpl->assign('MALOP', $ma_lop_get);
36+
$xtpl->assign('MABUOI', $ma_buoi_get);
3737

3838
$display_form = 'style="display: none"';
3939
//nam hoc
4040

4141
if($nv_Request->isset_request("change_schoolyear","post,get")) {
42-
$ma_nam_hoc = $nv_Request->get_int('ma_nam_hoc','get',0);
42+
$manamhoc = $nv_Request->get_int('manamhoc','get',0);
4343
// Subject
44-
if ($ma_nam_hoc > 0) {
45-
$queryweek = $db->query('SELECT * FROM ' . NV_PREFIXLANG . '_' . $module_data . '_week WHERE ma_nam_hoc='.$ma_nam_hoc.' ORDER BY tungay ASC');
44+
if ($manamhoc > 0) {
45+
$queryweek = $db->query('SELECT * FROM ' . NV_PREFIXLANG . '_' . $module_data . '_week WHERE ma_nam_hoc='.$manamhoc.' ORDER BY tu_ngay ASC');
4646
$html = '';
4747
while ($row = $queryweek->fetch()) {
48-
$html .= '<option value="' . $row['ma_tuan'] . '">' . $row['tentuan'].' ('.nv_date('d/m/Y', $row['tungay']). ' - '.nv_date('d/m/Y', $row['denngay']).')' . '</option>';
48+
$html .= '<option value="' . $row['ma_tuan'] . '">' . $row['ten_tuan'].' ('.nv_date('d/m/Y', $row['tu_ngay']). ' - '.nv_date('d/m/Y', $row['den_ngay']).')' . '</option>';
4949
}
5050
die($html);
5151
} else {
@@ -54,22 +54,22 @@
5454
}
5555

5656
// năm học
57-
// $queryschoolyear = $db->query('SELECT * FROM ' . NV_PREFIXLANG . '_' . $module_data . '_schoolyear ORDER BY tu_nam ASC');
57+
$queryschoolyear = $db->query('SELECT * FROM ' . NV_PREFIXLANG . '_' . $module_data . '_school_year ORDER BY tu_nam ASC');
5858

59-
// $selectedschoolyear=$ma_nam_hoc_get ? $ma_nam_hoc_get : 0;
60-
// $arrayschoolyear = [];
61-
// while ($row = $queryschoolyear->fetch()) {
62-
// $arrayschoolyear[$row['ma_nam_hoc']] = $row;
63-
// }
59+
$selectedschoolyear=$ma_nam_hoc_get ? $ma_nam_hoc_get : 0;
60+
$arrayschoolyear = [];
61+
while ($row = $queryschoolyear->fetch()) {
62+
$arrayschoolyear[$row['ma_nam_hoc']] = $row;
63+
}
6464

6565
// hien thi du lieu hocsinh
6666
if(!empty($arrayschoolyear)) {
6767
foreach ($arrayschoolyear as $value) {
6868
$value['key'] = $value['ma_nam_hoc'];
69-
$value['title'] = $value['tunam'] . ' - ' . $value['dennam'];
69+
$value['title'] = $value['tu_nam'] . ' - ' . $value['den_nam'];
7070
$value['selected'] = $selectedschoolyear == $value['ma_nam_hoc'] ? "selected" : "";
7171
$xtpl->assign('DATA_SCHOOLYEAR', $value);
72-
$xtpl->parse('manageheadbook.loopschoolyear');
72+
$xtpl->parse('headbook.loopschoolyear');
7373
}
7474
}
7575

@@ -86,10 +86,10 @@
8686
if(!empty($arrayclass)) {
8787
foreach ($arrayclass as $value) {
8888
$value['key'] = $value['ma_lop'];
89-
$value['title'] = $value['tenlop'];
89+
$value['title'] = $value['ten_lop'];
9090
$value['selected'] = $selectedclass == $value['ma_lop'] ? "selected" : "";
9191
$xtpl->assign('DATA_CLASS', $value);
92-
$xtpl->parse('manageheadbook.loopclass');
92+
$xtpl->parse('headbook.loopclass');
9393
}
9494
}
9595

@@ -100,12 +100,12 @@
100100
$data['title'] = $lang_module['daystatus'.$i];
101101
$data['selected'] = $selectedday == $i ? "selected" : "";
102102
$xtpl->assign('DATA_DAYSTUS', $data);
103-
$xtpl->parse('manageheadbook.loopdaystatus');
103+
$xtpl->parse('headbook.loopdaystatus');
104104
}
105105

106106
// tuan
107107
if($ma_tuan_get) {
108-
$queryweek = $db->query('SELECT * FROM ' . NV_PREFIXLANG . '_' . $module_data . '_week WHERE ma_nam_hoc ='.$ma_nam_hoc_get .' ORDER BY tungay ASC');
108+
$queryweek = $db->query('SELECT * FROM ' . NV_PREFIXLANG . '_' . $module_data . '_week WHERE ma_nam_hoc ='.$ma_nam_hoc_get .' ORDER BY tu_ngay ASC');
109109
// o day phai doi tim duoc hoc sinh nghi
110110
$selectedweek=$ma_tuan_get;
111111
$arrayweek = [];
@@ -117,25 +117,25 @@
117117
if(!empty($arrayweek)) {
118118
foreach ($arrayweek as $value) {
119119
$value['key'] = $value['ma_tuan'];
120-
$value['title'] = $value['tentuan'] .' ('.nv_date('d/m/Y', $value['tungay']). ' - '.nv_date('d/m/Y', $value['denngay']).')';
120+
$value['title'] = $value['ten_tuan'] .' ('.nv_date('d/m/Y', $value['tu_ngay']). ' - '.nv_date('d/m/Y', $value['den_ngay']).')';
121121
$value['selected'] = $selectedweek == $value['ma_tuan'] ? "selected" : "";
122122

123123
$xtpl->assign('DATA_WEEK', $value);
124-
$xtpl->parse('manageheadbook.loopweek');
124+
$xtpl->parse('headbook.loopweek');
125125
}
126126
}
127127
}
128128

129-
// $querytungay = $db->query('SELECT * FROM ' . NV_PREFIXLANG . '_' . $module_data . '_week WHERE ma_nam_hoc ='.$ma_nam_hoc_get . ' AND ma_tuan='.$ma_tuan_get);
129+
$querytungay = $db->query('SELECT * FROM ' . NV_PREFIXLANG . '_' . $module_data . '_week WHERE ma_nam_hoc ='.$ma_nam_hoc_get . ' AND ma_tuan='.$ma_tuan_get);
130130

131-
// $datatungay = $querytungay->fetch();
132-
// $currenttime = $datatungay['tungay'];
131+
$datatungay = $querytungay->fetch();
132+
$currenttime = $datatungay['tu_ngay'];
133133
// cho nay lay trang thai tuan do
134134

135135

136136

137137
if($ma_nam_hoc_get > 0 && $ma_lop_get > 0 && $ma_buoi_get >0 && $ma_tuan_get >0) {
138-
if($datatungay['trangthai'] == 1) {
138+
if($datatungay['trang_thai'] == 1) {
139139
$xtpl->assign('DISPLAY_INFO', 'style="display:none"');
140140
$xtpl->assign('DISPLAY_FUNC_TITLE', '');
141141
$xtpl->assign('DISPLAY_FUNC', '');
@@ -162,12 +162,12 @@
162162
}
163163
if ($value) {
164164
$value['checksess'] = md5($value['ma_so'] . NV_CHECK_SESSION);
165-
$value['edit_url'] = NV_BASE_ADMINURL . 'index.php?' . NV_LANG_VARIABLE . '=' . NV_LANG_DATA . '&' . NV_NAME_VARIABLE . '=' . $module_name . '&' . NV_OP_VARIABLE . '=addheadbook&ma_nam_hoc='.$ma_nam_hoc_get.'&ma_tuan=' . $ma_tuan_get . '&ma_lop='.$ma_lop_get. '&ma_buoi='.$ma_buoi_get. '&thu='.$i . '&tiet='.$value['tiet'] . '&id='.$value['ma_so'];
165+
$value['edit_url'] = NV_BASE_ADMINURL . 'index.php?' . NV_LANG_VARIABLE . '=' . NV_LANG_DATA . '&' . NV_NAME_VARIABLE . '=' . $module_name . '&' . NV_OP_VARIABLE . '=addheadbook&manamhoc='.$ma_nam_hoc_get.'&matuan=' . $ma_tuan_get . '&malop='.$ma_lop_get. '&mabuoi='.$ma_buoi_get. '&thu='.$i . '&tiet='.$value['tiet'] . '&id='.$value['ma_so'];
166166

167167
// lay ra mon hoc
168-
$querysubject = $db->query('SELECT * FROM ' . NV_PREFIXLANG . '_' . $module_data . '_subjectlist WHERE ma_monHoc=' . $value['ma_mon']);
168+
$querysubject = $db->query('SELECT * FROM ' . NV_PREFIXLANG . '_' . $module_data . '_subject WHERE ma_mon_hoc=' . $value['ma_mon']);
169169
$datasubject = $querysubject->fetch();
170-
$value['tenmonhoc'] = $datasubject['tenmonhoc'];
170+
$value['ten_mon_hoc'] = $datasubject['ten_mon_hoc'];
171171

172172
// chuyen thanh array
173173
$arrabsent1 = explode(",", $value['co_phep']);
@@ -178,12 +178,12 @@
178178
$last_key1 = end(array_keys($arrabsent1));
179179
foreach ($arrabsent1 as $key => $mahocsinh) {
180180
// die('SELECT * FROM ' . NV_PREFIXLANG . '_' . $module_data . '_studentlist WHERE maHocSinh=' . $mahocsinh);
181-
$queryabsent = $db->query('SELECT * FROM ' . NV_PREFIXLANG . '_' . $module_data . '_studentlist WHERE maHocSinh=' . $mahocsinh);
181+
$queryabsent = $db->query('SELECT * FROM ' . NV_PREFIXLANG . '_' . $module_data . '_student WHERE ma_hoc_sinh=' . $mahocsinh);
182182
$dataabsent = $queryabsent->fetch();
183183
if ($key == $last_key1) {
184-
$value['tenhocsinhnghi'] .= $dataabsent['hoten'] . ': CP';
184+
$value['tenhocsinhnghi'] .= $dataabsent['ho_ten'] . ': CP';
185185
} else {
186-
$value['tenhocsinhnghi'] .= $dataabsent['hoten'] . ', ';
186+
$value['tenhocsinhnghi'] .= $dataabsent['ho_ten'] . ', ';
187187
}
188188
}
189189
}
@@ -194,12 +194,12 @@
194194
$last_key2 = end(array_keys($arrabsent2));
195195
foreach ($arrabsent2 as $key => $mahocsinh) {
196196
// die('SELECT * FROM ' . NV_PREFIXLANG . '_' . $module_data . '_studentlist WHERE maHocSinh=' . $mahocsinh);
197-
$queryabsent = $db->query('SELECT * FROM ' . NV_PREFIXLANG . '_' . $module_data . '_studentlist WHERE maHocSinh=' . $mahocsinh);
197+
$queryabsent = $db->query('SELECT * FROM ' . NV_PREFIXLANG . '_' . $module_data . '_student WHERE ma_hoc_sinh=' . $mahocsinh);
198198
$dataabsent = $queryabsent->fetch();
199199
if ($key == $last_key2) {
200-
$value['tenhocsinhnghi'] .= $dataabsent['hoten'] . ': K';
200+
$value['tenhocsinhnghi'] .= $dataabsent['ho_ten'] . ': K';
201201
} else {
202-
$value['tenhocsinhnghi'] .= $dataabsent['hoten'] . ', ';
202+
$value['tenhocsinhnghi'] .= $dataabsent['ho_ten'] . ', ';
203203
}
204204
}
205205
}
@@ -216,9 +216,9 @@
216216
$querylate = $db->query('SELECT * FROM ' . NV_PREFIXLANG . '_' . $module_data . '_studentlist WHERE maHocSinh=' . $mahocsinh);
217217
$datalate = $querylate->fetch();
218218
if ($key == $last_key3) {
219-
$value['tenhocsinhdi_muon'] .= $datalate['hoten'];
219+
$value['tenhocsinhdi_muon'] .= $datalate['ho_ten'];
220220
} else {
221-
$value['tenhocsinhdi_muon'] .= $datalate['hoten'] . ', ';
221+
$value['tenhocsinhdi_muon'] .= $datalate['ho_ten'] . ', ';
222222
}
223223
}
224224
}
@@ -241,7 +241,7 @@
241241
$xtpl->assign('DAY', $day);
242242
$xtpl->assign('LESSON', $j);
243243

244-
$xtpl->parse('manageheadbook.loopday.looplesson');
244+
$xtpl->parse('headbook.loopday.looplesson');
245245
}
246246

247247
} else {
@@ -260,10 +260,10 @@
260260
$xtpl->assign('DISPLAY_IMG', 'none');
261261
$xtpl->assign('DISPLAY_EDIT', 'none');
262262

263-
$xtpl->parse('manageheadbook.loopday.looplesson');
263+
$xtpl->parse('headbook.loopday.looplesson');
264264
}
265265
}
266-
$xtpl->parse('manageheadbook.loopday');
266+
$xtpl->parse('headbook.loopday');
267267
$currenttime += 86400;
268268
}
269269
$display_form = '';
@@ -274,8 +274,8 @@
274274

275275
$xtpl->assign('DISPLAY_FORM', $display_form);
276276

277-
$xtpl->parse('manageheadbook');
278-
$contents = $xtpl->text('manageheadbook');
277+
$xtpl->parse('headbook');
278+
$contents = $xtpl->text('headbook');
279279

280280
include NV_ROOTDIR . '/includes/header.php';
281281
echo nv_admin_theme($contents);

‎modules/manageheadbook/language/admin_vi.php‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,62 @@
5050
$lang_module['head_book'] = 'Sổ đầu bài';
5151
$lang_module['manage_headbook'] = 'Quản lý sổ đầu bài';
5252

53+
54+
$lang_module['day'] = 'Thứ, ngày';
55+
$lang_module['lesson'] = 'Tiết';
56+
$lang_module['subject'] = 'Môn';
57+
$lang_module['lesson_program'] = 'Tiết PPCT';
58+
$lang_module['student_absent'] = 'Học sinh vắng';
59+
$lang_module['name_lesson'] = 'Tên bài học, nội dung công việc';
60+
$lang_module['comment'] = 'Nhận xét';
61+
$lang_module['mark'] = 'Điểm';
62+
$lang_module['study'] = 'Học tập';
63+
$lang_module['discipline'] = 'Kỷ luật';
64+
$lang_module['clean'] = 'Vệ sinh';
65+
$lang_module['total_point'] = 'Tổng điểm';
66+
$lang_module['teacher_sign'] = 'GV dạy kí tên';
67+
$lang_module['week'] = 'Tuần';
68+
$lang_module['from_day'] = 'Từ Ngày';
69+
$lang_module['to_day'] = 'Đến Ngày';
70+
$lang_module['week_summary'] = 'Tổng Kết Tuần';
71+
$lang_module['absent'] = 'Vắng';
72+
$lang_module['in_there'] = 'Trong đó';
73+
$lang_module['late'] = 'Đi học muộn';
74+
$lang_module['other_violation'] = 'Vi phạm khác';
75+
$lang_module['weekend_point'] = 'Điểm cuối tuần';
76+
$lang_module['minus_points'] = 'Điểm trừ (HS vắng)';
77+
$lang_module['average_week'] = 'Điểm TB của tuần';
78+
$lang_module['good_study_week'] = 'Đạt tuần học tốt';
79+
$lang_module['ranking'] = 'Xếp thứ';
80+
$lang_module['num_lesson_teacher_nosign'] = 'Số tiết GVBM không kí';
81+
$lang_module['comment_sub_teacher'] = 'Kiến nghị của GVBM';
82+
$lang_module['comment_main_teacher'] = 'Ý kiến của GVCN';
83+
$lang_module['comment_TPTD'] = 'Xác nhận của Tổng PT Đội';
84+
$lang_module['comment_BGH'] = 'Nhận xét của Ban Giám Hiệu';
85+
$lang_module['total_weekend'] = 'Tổng điểm cuối tuần';
86+
$lang_module['num_lesson_supplant'] = 'Số tiết dạy thay/dạy bù';
87+
$lang_module['of_subjects'] = 'Thuộc các môn';
88+
89+
$lang_module['day2'] = 'Thứ 2';
90+
$lang_module['day3'] = 'Thứ 3';
91+
$lang_module['day4'] = 'Thứ 4';
92+
$lang_module['day5'] = 'Thứ 5';
93+
$lang_module['day6'] = 'Thứ 6';
94+
$lang_module['day7'] = 'Thứ 7';
95+
$lang_module['day8'] = 'Chủ Nhật';
96+
97+
$lang_module['daystatus1'] = 'Buổi Sáng';
98+
$lang_module['daystatus2'] = 'Buổi Chiều';
99+
100+
$lang_module['week_display'] = 'Hiển thị sổ đầu bài';
101+
$lang_module['export_headbook'] = 'Xuất File sổ đầu bài';
102+
103+
104+
105+
106+
107+
$lang_module['head_book'] = 'Sổ đầu bài';
108+
53109
$lang_module['school_info'] = 'Thông tin trường học';
54110
$lang_module['department_name'] = 'Tên sở';
55111
$lang_module['room_name'] = 'Tên phòng';

‎themes/admin_default/js/manageheadbook.js‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,3 +40,12 @@ function nv_del_subject(ma_mon_hoc, checkss) {
4040
}
4141
return false;
4242
}
43+
44+
function change_schoolyear() {
45+
var manamhoc = $('#schoolyear').val();
46+
$.ajax({url: script_name + '?' + nv_lang_variable + '=' + nv_lang_data + '&' + nv_name_variable + '=' + nv_module_name + '&' + nv_fc_variable + '=headbook&change_schoolyear=1&manamhoc=' + manamhoc, success: function(result){
47+
if (result != 'ERR') {
48+
$("#week").append(result);
49+
}
50+
}});
51+
}

0 commit comments

Comments
 (0)