Skip to content
Snippets Groups Projects
Commit 957fef48 authored by Антон Шалимов's avatar Антон Шалимов
Browse files

...

parent dcb0e301
Branches
Tags
No related merge requests found
Hide whitespace changes
Inline Side-by-side
~dev_rating/application/classes/Controller/Teacher/Discipline.php
+ 45
− 2
View file @ 957fef48
...@@ -66,10 +66,53 @@ class Controller_Teacher_Discipline extends Controller_UserEnvi { ...@@ -66,10 +66,53 @@ class Controller_Teacher_Discipline extends Controller_UserEnvi {
$twig->User = $this->UserInfo; $twig->User = $this->UserInfo;
$twig->Discipline = $this->GetDisciplineInfo($db, $id); $twig->Discipline = $this->GetDisciplineInfo($db, $id);
$twig->Students = DataArray::factory('Students')->forDiscipline($this->UserInfo['TeacherID'], $id)->asArray();
$twig->GradesList = DataArray::factory('Grades')->common()->asArray(); $twig->GradesList = DataArray::factory('Grades')->common()->asArray();
$twig->StudyGroups = DataArray::factory('StudyGroups')->ordByGroups($twig->Discipline['GradeID'], $twig->Discipline['FacultyID'])->asArray(); $twig->StudyGroups = DataArray::factory('StudyGroups')->ordByGroups($twig->Discipline['GradeID'], $twig->Discipline['FacultyID'])->asArray();
$students = $db->getStudentsForDiscipline($this->UserInfo['TeacherID'], $id);
$stdHandled = array();
$attachStdHandled = array();
$groupID = 0; $i = 0; $k = 0;
foreach($students as $row) {
if ($row['Type'] == 'attach'){
$k++;
$attachStdHandled['StdCount'] += 1;
$attachStdHandled[$k]['StudentID'] = $row['StudentID'];
$attachStdHandled[$k]['LastName'] = $row['LastName'];
$attachStdHandled[$k]['FirstName'] = $row['FirstName'];
$attachStdHandled[$k]['SecondName'] = $row['SecondName'];
$attachStdHandled[$k]['StudentID'] = $row['StudentID'];
$attachStdHandled[$k]['GroupID'] = $row['GroupID'];
$attachStdHandled[$k]['GradeID'] = $row['GradeID'];
$attachStdHandled[$k]['GradeNum'] = $row['GradeNum'];
$attachStdHandled[$k]['GroupNum'] = $row['GroupNum'];
$attachStdHandled[$k]['Degree'] = $row['Degree'];
}
else
{
if ($row['GroupID'] != $groupID) {
$groupID = $row['GroupID'];
$i++;
$j = 0;
$stdHandled[$i]['GroupID'] = $row['GroupID'];
$stdHandled[$i]['GradeID'] = $row['GradeID'];
$stdHandled[$i]['GradeNum'] = $row['GradeNum'];
$stdHandled[$i]['GroupNum'] = $row['GroupNum'];
$stdHandled[$i]['Degree'] = DataArray::factory('Students')->getDegreeTitle($row['Degree']);
$stdHandled[$i]['StdCount'];
}
$j = $stdHandled[$i]['StdCount'] += 1;
$stdHandled[$i][$j]['StudentID'] = $row['StudentID'];
$stdHandled[$i][$j]['LastName'] = $row['LastName'];
$stdHandled[$i][$j]['FirstName'] = $row['FirstName'];
$stdHandled[$i][$j]['SecondName'] = $row['SecondName'];
$stdHandled[$i][$j]['Type'] = $row['Type'];
}
}
$twig->Students = $stdHandled;
$twig->AttachStudents = $attachStdHandled;
$this->response->body($twig); $this->response->body($twig);
} }
......
~dev_rating/application/classes/DataArr/Students.php
+ 1
− 47
View file @ 957fef48
...@@ -31,7 +31,7 @@ class DataArr_Students { ...@@ -31,7 +31,7 @@ class DataArr_Students {
return new DataArray_Result($this->generateArray($students)); return new DataArray_Result($this->generateArray($students));
} }
protected function getDegreeTitle($degree) public function getDegreeTitle($degree)
{ {
switch($degree) switch($degree)
{ {
...@@ -72,52 +72,6 @@ class DataArr_Students { ...@@ -72,52 +72,6 @@ class DataArr_Students {
return $studentsHandled; return $studentsHandled;
} }
public function forDiscipline($TeacherID, $DisciplineID)
{
$students = $this->model->getStudentsForDiscipline($TeacherID, $DisciplineID);
$stdHandled = array();
$detachStdHandled = array();
$groupID = 0; $i = 0; $k = 0;
foreach($students as $row) {
if ($row['Type'] == 'detach'){
$k++;
$detachStdHandled['StdCount'] += 1;
$detachStdHandled[$k]['StudentID'] = $row['StudentID'];
$detachStdHandled[$k]['LastName'] = $row['LastName'];
$detachStdHandled[$k]['FirstName'] = $row['FirstName'];
$detachStdHandled[$k]['SecondName'] = $row['SecondName'];
$detachStdHandled[$k]['StudentID'] = $row['StudentID'];
$detachStdHandled[$k]['GroupID'] = $row['GroupID'];
$detachStdHandled[$k]['GradeID'] = $row['GradeID'];
$detachStdHandled[$k]['GradeNum'] = $row['GradeNum'];
$detachStdHandled[$k]['GroupNum'] = $row['GroupNum'];
$detachStdHandled[$k]['Degree'] = $row['Degree'];
}
else
{
if ($row['GroupID'] != $groupID) {
$groupID = $row['GroupID'];
$i++;
$j = 0;
$stdHandled[$i]['GroupID'] = $row['GroupID'];
$stdHandled[$i]['GradeID'] = $row['GradeID'];
$stdHandled[$i]['GradeNum'] = $row['GradeNum'];
$stdHandled[$i]['GroupNum'] = $row['GroupNum'];
$stdHandled[$i]['Degree'] = $this->getDegreeTitle($row['Degree']);
$stdHandled[$i]['StdCount'];
}
$j = $stdHandled[$i]['StdCount'] += 1;
$stdHandled[$i][$j]['StudentID'] = $row['StudentID'];
$stdHandled[$i][$j]['LastName'] = $row['LastName'];
$stdHandled[$i][$j]['FirstName'] = $row['FirstName'];
$stdHandled[$i][$j]['SecondName'] = $row['SecondName'];
$stdHandled[$i][$j]['Type'] = $row['Type'];
}
}
return new DataArray_Result($this->generateArray($students));
}
public function NotAttendingDiscipline($GradeID, $GroupN, $FacultyID, $Last, $First, $Second, $DisciplineID) public function NotAttendingDiscipline($GradeID, $GroupN, $FacultyID, $Last, $First, $Second, $DisciplineID)
{ {
$students = $this->model->getStudentsNotAttendingDiscipline($GradeID, $GroupN, $FacultyID, $Last, $First, $Second, $DisciplineID); $students = $this->model->getStudentsNotAttendingDiscipline($GradeID, $GroupN, $FacultyID, $Last, $First, $Second, $DisciplineID);
......
~dev_rating/application/classes/Model/Teacher/Map.php
+ 7
− 0
View file @ 957fef48
...@@ -4,6 +4,13 @@ class Model_Teacher_Map extends Model ...@@ -4,6 +4,13 @@ class Model_Teacher_Map extends Model
{ {
public function getStudentsForDiscipline($teacherID, $disciplineID)
{
$sql = "CALL `getStudentsForDiscipline`('$teacherID', '$disciplineID'); ";
return DB::query(Database::SELECT, $sql)->execute();
}
public function addModuleBonus($teacherID, $disciplineID) public function addModuleBonus($teacherID, $disciplineID)
{ {
$sql = "SELECT `AddModuleBonus`('$teacherID', '$disciplineID') AS `Num`;"; $sql = "SELECT `AddModuleBonus`('$teacherID', '$disciplineID') AS `Num`;";
......
~dev_rating/application/views/teacher/discipline/EditStudents.twig
+ 1
− 0
View file @ 957fef48
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
{% import 'teacher/discipline/EditStudents' as idx %} {% import 'teacher/discipline/EditStudents' as idx %}
{% block map_content %} {% block map_content %}
<div class="StudentsList"> <div class="StudentsList">
<input type="hidden" class="HiddenInputFacultyID" value="{{ Discipline.FacultyID }}"> <input type="hidden" class="HiddenInputFacultyID" value="{{ Discipline.FacultyID }}">
<div class="AttachedStudentsList"> <div class="AttachedStudentsList">
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment