Merge branch 'master' of http://itlab.mmcs.sfedu.ru/git/grade-rating

db/StoredProcedures.sql

@@ -129,10 +129,23 @@ CREATE FUNCTION `SetBitmaskByPagename`	( 	`Pagename` TEXT CHARSET utf8,
 										) 	RETURNS int(11)
     NO SQL
 BEGIN
-	UPDATE `page_access`
-	SET page_access.Bitmask = Mask
+	DECLARE checker INT;
+	SELECT page_access.ID
+	INTO checker
+	FROM `page_access`
 	WHERE page_access.Pagename = Pagename
 	LIMIT 1;
+
+	IF checker > 0 THEN
+		UPDATE `page_access`
+		SET page_access.Bitmask = Mask
+		WHERE page_access.Pagename = Pagename
+		LIMIT 1;
+	ELSE
+		INSERT INTO `page_access`	(page_access.Pagename, page_access.Bitmask)
+		VALUES						(Pagename, Mask);
+
+	END IF;
 	RETURN 0;
 END //
 
@@ -1781,7 +1794,7 @@ BEGIN
 
 END //
 
-DROP FUNCTION IF EXISTS AddModule//
+DROP FUNCTION IF EXISTS AddModuleExam//
 CREATE FUNCTION `AddModuleExam`	(	`TeacherID` 	INT, 
 									`DisciplineID` 	INT
 								) 	RETURNS int(11)
@@ -1864,7 +1877,7 @@ BEGIN
 	RETURN 0;
 END //
 
-DROP FUNCTION IF EXISTS DeleteModule//
+DROP FUNCTION IF EXISTS DeleteModuleExam//
 CREATE FUNCTION `DeleteModuleExam`		(	`TeacherID` INT,
 											`DisciplineID` 	INT 
 										)  	RETURNS int(11)

~dev_rating/application/classes/Controller/Teacher/Map.php

@@ -143,10 +143,10 @@ class Controller_Teacher_Map extends Controller_UserEnvi {
         $teachersHandled = array(); $i = 0;
         
         foreach ($teachers as $row) {
-            $teachersHandled[$i] = $row['LastName'].' '.$row['FirstName'].'';
+            $teachersHandled[$i] = $row['TeacherLast'].' '.$row['TeacherFirst'].'';
             if(!empty($row['TeacherSecond']))
             {
-                $teachersHandled[$i] .= ' '.$row['SecondName'];
+                $teachersHandled[$i] .= ' '.$row['TeacherSecond'];
             }
             $i++;
         }

~dev_rating/application/views/settings.twig

@@ -13,7 +13,7 @@
 		<p class="help">Логин может состоять из латинских букв, цифр и символа _</p>
 		<div class="itemBlock">
 			<div class="title">Логин:</div>
-			<div class="field"><input type="text" class="inputLogin inputText" value="{{ User.Login }}"></div>
+			<div class="field"><input type="text" class="inputLogin inputText" value="{{ User.AccLogin }}"></div>
 		</div>
 		<button class="changeLogin saveSettings">Изменить логин</button>
 	</div>
@@ -21,7 +21,7 @@
 	<div class="settingsSection">
 		<div class="itemBlock">
 			<div class="title">Текущей адрес:</div>
-			<div class="field"><input type="text" class="inputText" value="{{ User.EMail }}" readonly></div>
+			<div class="field"><input type="text" class="inputText" value="{{ User.AccEMail }}" readonly></div>
 		</div>
 		<div class="itemBlock">
 			<div class="title">Новый адрес:</div>

~dev_rating/application/views/teacher/map/create.twig

@@ -4,6 +4,9 @@
 {% block media %} {# head -> css, js #}
 	{{ HTML.script('media/js/functions.js')|raw }}
 
+	{{ HTML.script('media/js/event_inspector/event_inspector.js')|raw }}
+	{{ HTML.style('media/js/event_inspector/event_inspector.css')|raw }}
+	
 	{{ HTML.style('media/css/construct.css')|raw }}
 	{{ HTML.script('media/js/construct/create.js')|raw }}
 {% endblock %}
@@ -30,7 +33,7 @@
 		</div>
 		<div class="section">
 			<select class="SelectDepartment">
-				<option value="{{ User.DepartmentID }}">{{ User.DepartmentName }}</option>
+				<option value="{{ User.DepID }}">{{ User.DepName }}</option>
 			</select>
 			<select class="SelectGrade">
 				<option value="0">Выберите курс:</option>

~dev_rating/application/views/teacher/map/edit.twig

@@ -3,9 +3,6 @@
 {% block title %}Конструктор УКД{% endblock %} {# head -> title #}
 {% block media %} {# head -> css, js #}
 	{{ HTML.script('media/js/functions.js')|raw }}
-
-	{{ HTML.style('media/js/wnd/wnd.css')|raw }}
-	{{ HTML.script('media/js/wnd/wnd.js')|raw }}
 	
 	{{ HTML.script('media/js/event_inspector/event_inspector.js')|raw }}
 	{{ HTML.style('media/js/event_inspector/event_inspector.css')|raw }}
@@ -17,10 +14,14 @@
 
 {% block main_top_title %}Редактирование УКД{% endblock %}
 {% block main_content %}
+	<div class="tabs">
+		<div class="tab step_1">Шаг 1<span class="desc">. Базоые настройки УКД</span></div>
+		<div class="tab step_2 active">Шаг 2<span class="desc">. Структура УКД</span></div>
+		<div class="tab step_3">Шаг 3<span class="desc">. Прикрепление групп</span></div>
+		<div class="tab step_4">Шаг 4<span class="desc">. Прикрепление студентов</span></div>
+	</div>
+	<p class="top_center_info" style="display: none">Учебная карта дисциплины на 1 семестр 2014 года</p>
 	<div class="discipline">
-		<p class="top_center_info">Учебная карта дисциплины на 1 семестр 2014 года</p>
-		<span class="AttachGroups">Прикрепить группы</span>
-		<span class="AttachStudents">Прикрепить студентов</span>
 		<div class="section">
 			<select class="SelectSubject">
 				<option value="0">Выберите предмет:</option>
@@ -31,7 +32,7 @@
 		</div>
 		<div class="section">
 			<select class="SelectDepartment">
-				<option value="{{ User.DepartmentID }}">{{ User.DepartmentName }}</option>
+				<option value="{{ User.DepID }}">{{ User.DepName }}</option>
 			</select>
 			<select class="SelectGrade">
 				<option value="0">Выберите курс:</option>
@@ -53,12 +54,12 @@
 		</div>
 		<button class="ChangeDiscipline">Сохранить</button>
 	</div>
-	<div class="construct">
+	<div class="structure">
 		<div class="studyMap">
 			<div class="name">Виды контрольных мероприятий</div>
 			<div class="currentControl">Текущий контроль</div>
 			<div class="landmarkControl">Рубежный контроль</div>
-			<div class="actions">Действия</div>
+			<div class="actions" style="text-align: right; padding-right: 30px;">Действия</div>
 		</div>
 		<div class="moduleList">
 		{% for i in range(1, Map.ModulesCount) if Map.ModulesCount > 0 %}

~dev_rating/media/css/construct.css

@@ -16,8 +16,32 @@
 			margin: 15px 0px 15px 20px;
 			font-size: 15px;
 		}
+		
+/* -- Вкладки на странице -------------------- */
+.tabs {
+	margin-left: 25px;
+}
+	.tabs .tab {
+		display: inline;
+		float: left;
+		background: #EEEEEE;
+		padding: 5px 12px;
+		margin-right: 2px;
+		font-size: 13px;
+		color: #333;
+		cursor: pointer
+	}
+	.tabs .tab:hover {
+		background-color: #3399CC;
+		color: #f6f7f7;
+	}
+	.tabs .tab.active {
+		background-color: #3399CC;
+		color: #f6f7f7;
+	}
 
-.discipline {	
+.discipline {
+	display: none;
 	margin: 0px 25px;
 }
 .discipline .top_center_info {
@@ -42,11 +66,11 @@
 
 
 
-.construct { 
-	margin: 10px 25px;
+.structure { 
+	margin: 0px 25px;
 }
 	
-	.construct .empty {
+	.structure .empty {
 		display: block;
 	}
 

~dev_rating/media/js/construct/create.js

@@ -16,9 +16,10 @@ $(function() {
 			function(data){
 				data = $.parseJSON(data);
 				if(data.success === true) {
-					alert('Ок, AddDiscipline');
+					$('.AddDiscipline').hide();
+					EventInspector_ShowMsg('Ок, AddDiscipline', 'success');
 					setTimeout('location.replace("/~dev_rating/map/'+data.DisciplineID+'")',5000); 
-				} else alert('Error, AddDiscipline');
+				} else EventInspector_ShowMsg('Error, AddDiscipline', 'error');
 			}
 		);
     });

~dev_rating/media/js/construct/edit.js

@@ -3,6 +3,22 @@ $(function() {
 	var URL = (window.location.href).split('/');
 	var DisciplineID = URL[URL.length - 1]
 	
+	// Вкладки
+	$('.tab').click(function(){
+		$('.tab').each(function(){
+			$(this).removeClass('active');
+		});
+		$(this).addClass('active');
+		$('.discipline').hide();
+		$('.structure').hide();
+	});
+	$('.step_1').click(function(){
+		$('.discipline').show();
+	});
+	$('.step_2').click(function(){
+		$('.structure').show();
+	});
+	
 	// Шаблон мероприятия
 	function GetSubModuleTmp(){
 		return '\