Skip to content

Commit e167109

Browse files
nguyetque01nguyetque01
authored
Merge pull request #18 from phapdev/program_distribution
import phan phoi chuong trinh
2 parents 994bd37 + 9a2fc90 commit e167109

File tree

4 files changed

+82
-79
lines changed

4 files changed

+82
-79
lines changed

‎modules/manageheadbook/action_mysql.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,9 +112,9 @@
112112
ma_chuong_trinh int(11) NOT NULL AUTO_INCREMENT,
113113
ma_nam_hoc int(11) DEFAULT NULL,
114114
ma_mon_hoc int(11) DEFAULT NULL,
115-
khoi int(2) NOT NULL,
115+
grade int(2) NOT NULL,
116116
tiet int(5) NOT NULL,
117-
ten_bai_hoc varchar(250) COLLATE utf8mb4_unicode_ci NOT NULL,
117+
lesson varchar(250) COLLATE utf8mb4_unicode_ci NOT NULL,
118118
PRIMARY KEY (ma_chuong_trinh)
119119
) ENGINE=MyISAM;";
120120

‎modules/manageheadbook/admin/program.php‎

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -50,53 +50,53 @@
5050
}
5151
}
5252

53-
$queryschoolyear = $db->query('SELECT * FROM ' . NV_PREFIXLANG . '_' . $module_data . '_school_years');
53+
$queryschool_year = $db->query('SELECT * FROM ' . NV_PREFIXLANG . '_' . $module_data . '_school_year');
5454
$i = 0;
55-
$selectedschoolyear;
56-
while ($row = $queryschoolyear->fetch()) {
57-
$arrayschoolyear[$row['ma_nam_hoc']] = $row;
55+
$selectedschool_year;
56+
while ($row = $queryschool_year->fetch()) {
57+
$arrayschool_year[$row['ma_nam_hoc']] = $row;
5858
if($i ==0)
5959
{
60-
$selectedschoolyear = $row['ma_nam_hoc'];
60+
$selectedschool_year = $row['ma_nam_hoc'];
6161
}
6262
$i++;
6363
}
6464

65-
if(!empty($arrayschoolyear)) {
66-
foreach ($arrayschoolyear as $value) {
65+
if(!empty($arrayschool_year)) {
66+
foreach ($arrayschool_year as $value) {
6767
$value['key'] = $value['ma_nam_hoc'];
6868
$value['title'] = $value['tu_nam'] . ' - ' . $value['den_nam'];
69-
$value['selected'] = $selectedschoolyear == $value['ma_nam_hoc'] ? "selected" : "";
70-
$xtpl->assign('DATA_SCHOOL_YEARs', $value);
71-
$xtpl->parse('main.loopschoolyear');
69+
$value['selected'] = $selectedschool_year == $value['ma_nam_hoc'] ? "selected" : "";
70+
$xtpl->assign('DATA_SCHOOL_YEAR', $value);
71+
$xtpl->parse('main.loopschool_year');
7272
}
7373
}
7474

75-
$selectedkhoi = $lang_module['khoi'];
75+
$selectedgrade = $lang_module['grade'];
7676
for ($i = 1; $i <= 12; ++$i) {
7777
$value = [
7878
'key' => $i,
79-
'title' => $lang_module['khoi' . $i],
80-
'selected' => $selectedkhoi == $lang_module['khoi' . $i] ? ' selected="selected"' : ''
79+
'title' => $lang_module['grade' . $i],
80+
'selected' => $selectedgrade == $lang_module['grade' . $i] ? ' selected="selected"' : ''
8181
];
82-
$xtpl->assign('DATA_KHOI', $value);
83-
$xtpl->parse('main.loopkhoi');
82+
$xtpl->assign('DATA_GRADE', $value);
83+
$xtpl->parse('main.loopgrade');
8484
}
8585

8686
for ($i = 1; $i <= 12; ++$i) {
87-
$khoi = nv_substr($nv_Request->get_title('khoi_' . $i, 'post', ''), 0, 250);
87+
$grade = nv_substr($nv_Request->get_title('grade_' . $i, 'post', ''), 0, 250);
8888
}
89-
$khoi = $lang_module['khoi' . $khoi];
89+
$grade = $lang_module['grade' . $grade];
9090

9191
if(!empty($arraysubject)) {
9292
foreach ($arraysubject as $value) {
9393
$ma_mon_hoc = $nv_Request->get_int('subject_' . $value['ma_mon_hoc'], 'post', '');
9494
}
9595
}
9696

97-
if(!empty($arrayschoolyear)) {
98-
foreach ($arrayschoolyear as $value) {
99-
$ma_nam_hoc = $nv_Request->get_int('schoolyear_' . $value['ma_nam_hoc'], 'post', '');
97+
if(!empty($arrayschool_year)) {
98+
foreach ($arrayschool_year as $value) {
99+
$ma_nam_hoc = $nv_Request->get_int('school_year_' . $value['ma_nam_hoc'], 'post', '');
100100
}
101101
}
102102

@@ -111,7 +111,7 @@
111111
if (move_uploaded_file($_FILES['ufile']['tmp_name'], $file)) {
112112
if (file_exists($file)) {
113113
try {
114-
$fileType = PHPExcel_IOFactory::identify($file);
114+
$fileType = PHPExcel_IOFactory::ma_chuong_trinhentify($file);
115115
$objReader = PHPExcel_IOFactory::createReader($fileType);
116116
$objPHPExcel = $objReader->load($file);
117117
} catch(Exception $e) {
@@ -129,19 +129,19 @@
129129
}
130130

131131
// Bắt đầu import vào database
132-
$db->query('DELETE FROM ' . NV_PREFIXLANG . '_' . $module_data . '_program WHERE ma_mon_hoc = ' . $ma_mon_hoc . ' AND ma_nam_hoc = ' . $ma_nam_hoc . ' AND khoi = ' . $khoi);
132+
$db->query('DELETE FROM ' . NV_PREFIXLANG . '_' . $module_data . '_program WHERE ma_mon_hoc = ' . $ma_mon_hoc . ' AND ma_nam_hoc = ' . $ma_nam_hoc . ' AND grade = ' . $grade);
133133
for($i = 1; $i <= $highestRow - 1; $i++) {
134134
$tiet = $data[$i][0][0];
135-
$ten_bai_hoc = $data[$i][0][1];
135+
$lesson = $data[$i][0][1];
136136
$_sql = 'INSERT INTO ' . NV_PREFIXLANG . '_' . $module_data . '_program
137-
(ma_nam_hoc, khoi, ma_mon_hoc, tiet, ten_bai_hoc) VALUES
138-
(:ma_nam_hoc, :khoi, :ma_mon_hoc, :tiet, :ten_bai_hoc)';
137+
(ma_nam_hoc, grade, ma_mon_hoc, tiet, lesson) VALUES
138+
(:ma_nam_hoc, :grade, :ma_mon_hoc, :tiet, :lesson)';
139139
$sth = $db->prepare($_sql);
140140
$sth->bindParam(':ma_nam_hoc', $ma_nam_hoc, PDO::PARAM_INT);
141-
$sth->bindParam(':khoi', $khoi, PDO::PARAM_INT);
141+
$sth->bindParam(':grade', $grade, PDO::PARAM_INT);
142142
$sth->bindParam(':ma_mon_hoc', $ma_mon_hoc, PDO::PARAM_INT);
143143
$sth->bindParam(':tiet', $tiet, PDO::PARAM_INT);
144-
$sth->bindParam(':ten_bai_hoc', $ten_bai_hoc, PDO::PARAM_INT);
144+
$sth->bindParam(':lesson', $lesson, PDO::PARAM_INT);
145145
$sth->execute();
146146
// die($sth);
147147
}
@@ -165,7 +165,7 @@
165165
$query = $db->query('SELECT * FROM ' . NV_PREFIXLANG . '_' . $module_data . '_program');
166166
// Đổ dữ liệu
167167
while ($row = $query->fetch()) {
168-
$array[$row['id']] = $row;
168+
$array[$row['ma_chuong_trinh']] = $row;
169169
}
170170
// hien thi du lieu
171171
if($array) {
@@ -176,9 +176,9 @@
176176
$row_selected_subject = $query_selected_subject->fetch();
177177
$value['mon_hoc'] = $row_selected_subject['ten_mon_hoc'];
178178

179-
$query_school_years = $db->query("SELECT * FROM " . NV_PREFIXLANG . "_" . $module_data . "_school_years WHERE ma_nam_hoc=". $value['ma_nam_hoc']);
180-
$data_school_years = $query_school_years->fetch();
181-
$value['nam_hoc'] = $data_school_years['tu_nam'] . ' - ' . $data_school_years['den_nam'];
179+
$query_school_year = $db->query("SELECT * FROM " . NV_PREFIXLANG . "_" . $module_data . "_school_year WHERE ma_nam_hoc=". $value['ma_nam_hoc']);
180+
$data_school_year = $query_school_year->fetch();
181+
$value['nam_hoc'] = $data_school_year['tu_nam'] . ' - ' . $data_school_year['den_nam'];
182182

183183
$xtpl->assign('DATA', $value);
184184
$xtpl->parse('main.show.loop');
@@ -190,40 +190,40 @@
190190
// Khi nhấn Xem
191191
if ($nv_Request->isset_request('show', 'post')) {
192192
// Gọi csdl để lấy dữ liệu
193-
$query = $db->query('SELECT * FROM ' . NV_PREFIXLANG . '_' . $module_data . '_program WHERE ma_mon_hoc = ' . $ma_mon_hoc . ' AND ma_nam_hoc = "' . $ma_nam_hoc . '" AND khoi = ' . $khoi);
193+
$query = $db->query('SELECT * FROM ' . NV_PREFIXLANG . '_' . $module_data . '_program WHERE ma_mon_hoc = ' . $ma_mon_hoc . ' AND ma_nam_hoc = "' . $ma_nam_hoc . '" AND grade = ' . $grade);
194194
// Đổ dữ liệu
195195
while ($row = $query->fetch()) {
196-
$array[$row['id']] = $row;
196+
$array[$row['ma_chuong_trinh']] = $row;
197197
}
198198
// hien thi du lieu
199-
if($array) {
199+
200200
$i = 1;
201201
foreach ($array as $value) {
202202
$value['stt'] = $i++;
203203
$query_selected_subject = $db->query('SELECT * FROM ' . NV_PREFIXLANG . '_' . $module_data . '_subject WHERE ma_mon_hoc = ' . $value['ma_mon_hoc']);
204204
$row_selected_subject = $query_selected_subject->fetch();
205205
$value['mon_hoc'] = $row_selected_subject['ten_mon_hoc'];
206206

207-
$query_school_years = $db->query("SELECT * FROM " . NV_PREFIXLANG . "_" . $module_data . "_school_years WHERE ma_nam_hoc=". $value['ma_nam_hoc']);
208-
$data_school_years = $query_school_years->fetch();
209-
$value['nam_hoc'] = $data_school_years['tu_nam'] . ' - ' . $data_school_years['den_nam'];
207+
$query_school_year = $db->query("SELECT * FROM " . NV_PREFIXLANG . "_" . $module_data . "_school_year WHERE ma_nam_hoc=". $value['ma_nam_hoc']);
208+
$data_school_year = $query_school_year->fetch();
209+
$value['nam_hoc'] = $data_school_year['tu_nam'] . ' - ' . $data_school_year['den_nam'];
210210

211211
$xtpl->assign('DATA', $value);
212212
$xtpl->parse('main.show.loop');
213213
}
214-
}
214+
215215
$xtpl->parse('main.show');
216216
}
217217

218218
if ($nv_Request->isset_request('del', 'post')) {
219-
if($ma_mon_hoc && $ma_nam_hoc && $khoi) {
220-
$query = $db->query('SELECT * FROM ' . NV_PREFIXLANG . '_' . $module_data . '_program WHERE ma_mon_hoc = ' . $ma_mon_hoc . ' AND ma_nam_hoc = "' . $ma_nam_hoc . '" AND khoi = ' . $khoi);
219+
if($ma_mon_hoc && $ma_nam_hoc && $grade) {
220+
$query = $db->query('SELECT * FROM ' . NV_PREFIXLANG . '_' . $module_data . '_program WHERE ma_mon_hoc = ' . $ma_mon_hoc . ' AND ma_nam_hoc = "' . $ma_nam_hoc . '" AND grade = ' . $grade);
221221
if($query) {
222222
while ($row = $query->fetch()) {
223-
$array[$row['malop']] = $row;
223+
$array[$row['ma_lop']] = $row;
224224
}
225225
if($array) {
226-
$db->query('DELETE FROM ' . NV_PREFIXLANG . '_' . $module_data . '_program WHERE ma_mon_hoc = ' . $ma_mon_hoc . ' AND ma_nam_hoc = "' . $ma_nam_hoc . '" AND khoi = ' . $khoi);
226+
$db->query('DELETE FROM ' . NV_PREFIXLANG . '_' . $module_data . '_program WHERE ma_mon_hoc = ' . $ma_mon_hoc . ' AND ma_nam_hoc = "' . $ma_nam_hoc . '" AND grade = ' . $grade);
227227
$success = $lang_module['delete_success'];
228228
}
229229
else
@@ -238,7 +238,7 @@
238238
$query = $db->query('SELECT * FROM ' . NV_PREFIXLANG . '_' . $module_data . '_program');
239239
if($query) {
240240
while ($row = $query->fetch()) {
241-
$array[$row['malop']] = $row;
241+
$array[$row['ma_lop']] = $row;
242242
}
243243
if($array) {
244244
$db->query('DELETE FROM ' . NV_PREFIXLANG . '_' . $module_data . '_program');

‎modules/manageheadbook/language/admin_vi.php‎

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<<?php
1+
<?php
22

33
/**
44
* Headbook Management System
@@ -157,20 +157,23 @@
157157
$lang_module['delete_success'] = 'Xóa thành công !';
158158
$lang_module['config'] = 'Cấu hình';
159159

160-
$lang_module['namhoc'] = 'Năm học';
161-
$lang_module['khoi'] = 'Khối';
160+
$lang_module['school_year'] = 'Năm học';
161+
$lang_module['grade'] = 'Khối';
162162
$lang_module['tiet'] = 'Tiết';
163-
$lang_module['tenbaihoc'] = 'Tên bài học';
164-
165-
$lang_module['khoi1'] = '1';
166-
$lang_module['khoi2'] = '2';
167-
$lang_module['khoi3'] = '3';
168-
$lang_module['khoi4'] = '4';
169-
$lang_module['khoi5'] = '5';
170-
$lang_module['khoi6'] = '6';
171-
$lang_module['khoi7'] = '7';
172-
$lang_module['khoi8'] = '8';
173-
$lang_module['khoi9'] = '9';
174-
$lang_module['khoi10'] = '10';
175-
$lang_module['khoi11'] = '11';
176-
$lang_module['khoi12'] = '12';
163+
164+
$lang_module['lesson'] = 'Tên bài học';
165+
166+
$lang_module['grade1'] = '1';
167+
$lang_module['grade2'] = '2';
168+
$lang_module['grade3'] = '3';
169+
$lang_module['grade4'] = '4';
170+
$lang_module['grade5'] = '5';
171+
$lang_module['grade6'] = '6';
172+
$lang_module['grade7'] = '7';
173+
$lang_module['grade8'] = '8';
174+
$lang_module['grade9'] = '9';
175+
$lang_module['grade10'] = '10';
176+
$lang_module['grade11'] = '11';
177+
$lang_module['grade12'] = '12';
178+
179+

‎themes/admin_default/modules/manageheadbook/program.tpl‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -16,22 +16,22 @@
1616
<table class="table table-striped table-bordered table-hover">
1717
<tbody>
1818
<tr>
19-
<td class="text-right">{LANG.schoolyear} <sup class="required">(*)</sup><br><small class="text-danger">{LANG.require_select}</small></td>
19+
<td class="text-right">{LANG.school_year} <sup class="required">(*)</sup><br><small class="text-danger">{LANG.require_select}</small></td>
2020
<td>
21-
<select class="form-control w200" name="schoolyear_{DATA_SCHOOLYEAR.key}">
22-
<!-- BEGIN: loopschoolyear -->
23-
<option value="{DATA_SCHOOLYEAR.key}" {DATA_SCHOOLYEAR.selected}>{DATA_SCHOOLYEAR.title}</option>
24-
<!-- END: loopschoolyear -->
21+
<select class="form-control w200" name="school_year_{DATA_SCHOOL_YEAR.key}">
22+
<!-- BEGIN: loopschool_year -->
23+
<option value="{DATA_SCHOOL_YEAR.key}" {DATA_SCHOOL_YEAR.selected}>{DATA_SCHOOL_YEAR.title}</option>
24+
<!-- END: loopschool_year -->
2525
</select>
2626
</td>
2727
</tr>
2828
<tr>
29-
<td class="text-right">{LANG.khoi} <sup class="required">(*)</sup><br><small class="text-danger">{LANG.require_select}</small></td>
29+
<td class="text-right">{LANG.grade} <sup class="required">(*)</sup><br><small class="text-danger">{LANG.require_select}</small></td>
3030
<td>
31-
<select class="form-control w150" name="khoi_{DATA_KHOI.key}">
32-
<!-- BEGIN: loopkhoi -->
33-
<option value="{DATA_KHOI.key}" {DATA_KHOI.selected}>{DATA_KHOI.title}</option>
34-
<!-- END: loopkhoi -->
31+
<select class="form-control w150" name="grade_{DATA_GRADE.key}">
32+
<!-- BEGIN: loopgrade -->
33+
<option value="{DATA_GRADE.key}" {DATA_GRADE.selected}>{DATA_GRADE.title}</option>
34+
<!-- END: loopgrade -->
3535
</select>
3636
</td>
3737
</tr>
@@ -71,22 +71,22 @@
7171
<thead>
7272
<tr>
7373
<th class="w100">{LANG.stt}</th>
74-
<th class="w100">{LANG.namhoc}</th>
75-
<th class="w100">{LANG.khoi}</th>
74+
<th class="w100">{LANG.school_year}</th>
75+
<th class="w100">{LANG.grade}</th>
7676
<th class="w100">{LANG.subject}</th>
7777
<th class="w100">{LANG.tiet}</th>
78-
<th class="w100">{LANG.tenbaihoc}</th>
78+
<th class="w100">{LANG.lesson}</th>
7979
</tr>
8080
</thead>
8181
<tbody>
8282
<!-- BEGIN: loop -->
8383
<tr>
8484
<td>{DATA.stt}</td>
85-
<td>{DATA.namhoc}</td>
86-
<td>{DATA.khoi}</td>
87-
<td>{DATA.monhoc}</td>
85+
<td>{DATA.nam_hoc}</td>
86+
<td>{DATA.grade}</td>
87+
<td>{DATA.mon_hoc}</td>
8888
<td>{DATA.tiet}</td>
89-
<td>{DATA.tenbaihoc}</td>
89+
<td>{DATA.lesson}</td>
9090
</tr>
9191
<!-- END: loop -->
9292
</tbody>

0 commit comments

Comments
 (0)