Skip to content

Commit

Permalink
Release 3.2.1
Browse files Browse the repository at this point in the history
  • Loading branch information
meesudzu committed Nov 6, 2018
1 parent de435da commit 20474d7
Show file tree
Hide file tree
Showing 45 changed files with 230 additions and 511 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
v3.2.1 (07/11/2018)

- Fix chức năng làm bài của học sinh
- Thay đổi một chút giao diện cho hợp lý hơn
- Thay đổi cấu trúc thư mục
v3.2.0 (06/11/2018)

- Nâng cấp chức năng tạo đề thi của quản trị viên ✓
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Xem tại [CHANGELOG](CHANGELOG.md)<br />
- Thêm nhiều dạng bài tập trắc nghiệm hơn
- Hỡ trợ nhiều dạng thông tin có trong câu hỏi hơn như hình ảnh, âm thanh, video...
[Hướng dẫn sử dụng](GUIDE.md)
## Ảnh Demo (Chụp Từ v3.2.0)
## Ảnh Demo (Chụp Từ v3.2.1)
![INSTALL](demo-images/install.png)
![Đăng nhập 1](demo-images/login-1.PNG)
![Đăng nhập 2](demo-images/login-2.PNG)
Expand Down
Binary file modified demo-images/1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified demo-images/8.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions resource/config/config.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ class Config
{
const TITLE = 'Hệ Thống Trắc Nghiệm Online';
const COPYRIGHT = "Copyright © 2016 By Dzu";
const VERSION = "3.2.0";
const VERSION = "3.2.1";
const OWNER = "Nông Văn Du (Dzu)";
const CONTRIBUTOR = "";
const EMAIL = "[email protected]";
const RELEASE = "06/11/2018";
const RELEASE = "07/11/2018";
const TIMEZONE = "Asia/Bangkok";
}
4 changes: 2 additions & 2 deletions resource/controllers/controller_admin.php
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,7 @@ public function get_dashboard_info()
$test->icon = "fa-edit";
$test->actionlink = "show_tests_panel";
$total = array($admin,$teacher,$student,$grade,$class,$subject,$question,$test);
echo json_encode($total);
return $total;
}
public function notify_teacher($ID, $teacher_id)
{
Expand Down Expand Up @@ -1122,7 +1122,7 @@ public function show_dashboard()
{
$view = new View_Admin();
$view->show_head_left($this->info);
$view->show_dashboard();
$view->show_dashboard($this->get_dashboard_info());
$view->show_foot();
}
public function show_teachers_panel()
Expand Down
19 changes: 6 additions & 13 deletions resource/controllers/controller_student.php
Original file line number Diff line number Diff line change
Expand Up @@ -72,11 +72,6 @@ public function get_profiles()
$profiles = new Model_Student();
echo json_encode($profiles->get_profiles($this->info['username']));
}
public function get_scores()
{
$profiles = new Model_Student();
echo json_encode($profiles->get_scores($this->info['ID']));
}
public function get_notifications()
{
$noti = new Model_Student();
Expand All @@ -92,11 +87,6 @@ public function get_chat_all()
$chat_all = new Model_Student();
echo json_encode($chat_all->get_chat_all($this->info['class_id']));
}
public function get_list_tests()
{
$list_tests = new Model_Student();
echo json_encode($list_tests->get_list_tests());
}
public function valid_email_on_profiles()
{
$result = array();
Expand Down Expand Up @@ -241,7 +231,10 @@ public function show_dashboard()
$view = new View_Student();
if($this->info['doing_exam'] == '') {
$view->show_head_left($this->info);
$view->show_dashboard();
$model = new Model_Student();
$scores = $model->get_scores($this->info['ID']);
$tests = $model->get_list_tests();
$view->show_dashboard($tests, $scores);
$view->show_foot();
}
else {
Expand Down Expand Up @@ -270,11 +263,11 @@ public function show_chat()
$view->show_exam($test,$min,$sec);
}
}
public function show_chat_all()
public function show_all_chat()
{
$view = new View_Student();
$view->show_head_left($this->info);
$view->show_chat_all();
$view->show_all_chat();
$view->show_foot();
}
public function show_notifications()
Expand Down
242 changes: 0 additions & 242 deletions resource/install.php

This file was deleted.

18 changes: 7 additions & 11 deletions resource/res/css/style.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 20474d7

Please sign in to comment.