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

.gitignore

-application/cache/
-application/logs/
-application/config/
-system/
-modules/kotwig/cache/
+~dev_rating/application/cache/
+~dev_rating/application/logs/
+~dev_rating/application/config/
+~dev_rating/system/
+~dev_rating/modules/kotwig/cache/
+nbproject/
 *.*~
+~dev_rating/.htaccess
 /.project
+

db/Sample.sql

@@ -48,14 +48,6 @@ INSERT INTO `degrees` (`ID`, `Name`) VALUES
 (13, 'Старший научный сотрудник'),
 (14, 'Доцент');
 
---
--- Дамп данных таблицы `departments`
---
-
-INSERT INTO `departments` (`ID`, `Name`, `FacultyID`) VALUES
-(1, 'Кафедра математического анализа', 1),
-(2, 'Кафедра магического анализа', 1);
-
 --
 -- Дамп данных таблицы `faculties`
 --
@@ -64,6 +56,14 @@ INSERT INTO `faculties` (`ID`, `Name`, `Abbr`) VALUES
 (1, 'Математика Механика и КН', 'МехМат'),
 (2, 'Юридический факультет', 'ЮрФак');
 
+--
+-- Дамп данных таблицы `departments`
+--
+
+INSERT INTO `departments` (`ID`, `Name`, `FacultyID`) VALUES
+(1, 'Кафедра математического анализа', 1),
+(2, 'Кафедра магического анализа', 1);
+
 --
 -- Дамп данных таблицы `general_settings`
 --
@@ -90,18 +90,18 @@ INSERT INTO `specializations` (`ID`, `Name`, `Abbr`, `FacultyID`) VALUES
 (4, 'Механика', 'Механика', 1);
 
 --
--- Дамп данных таблицы `students`
+-- Дамп данных таблицы `study_groups`
 --
 
-INSERT INTO `students` (`ID`, `StudyGroupID`, `AccountID`, `LastName`, `FirstName`, `SecondName`) VALUES
-(1, 1, 7, 'Иванов', 'Иван', 'Иванович');
+INSERT INTO `study_groups` (`ID`, `Grade`, `GroupNum`, `SpecializationID`, `Name`) VALUES
+(1, 1, 1, 1, NULL);
 
 --
--- Дамп данных таблицы `study_groups`
+-- Дамп данных таблицы `students`
 --
 
-INSERT INTO `study_groups` (`ID`, `Grade`, `GroupNum`, `SpecializationID`, `Name`) VALUES
-(1, 1, 1, 1, NULL);
+INSERT INTO `students` (`ID`, `StudyGroupID`, `AccountID`, `LastName`, `FirstName`, `SecondName`) VALUES
+(1, 1, 7, 'Иванов', 'Иван', 'Иванович');
 
 --
 -- Дамп данных таблицы `subjects`
@@ -120,14 +120,6 @@ INSERT INTO `subjects` (`ID`, `Name`, `Abbr`) VALUES
 INSERT INTO `teachers` (`ID`, `LastName`, `FirstName`, `SecondName`, `DegreeID`, `DepartmentID`, `AccountID`) VALUES
 (1, 'Колобок', 'Фазиль', 'Евреивич', 9, 1, 6);
 
---
--- Дамп данных таблицы `user_roles`
---
-
-INSERT INTO `user_roles` (`ID`, `Type`, `Role`, `Mark`) VALUES
-(1, 'student', 'common', 0),
-(2, 'teacher', 'common', 0);
-
 /*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
 /*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;

db/Structure.sql

@@ -366,11 +366,20 @@ CREATE TABLE IF NOT EXISTS `teachers` (
 CREATE TABLE IF NOT EXISTS `user_roles` (
   `ID` int(11) NOT NULL AUTO_INCREMENT,
   `Type` enum('student','teacher') NOT NULL,
-  `Role` enum('common','classMonitor','departmentAdmin','admin') NOT NULL,
+  `RoleName` varchar(30) NOT NULL,
   `Mark` int(11) NOT NULL,
   PRIMARY KEY (`ID`)
 ) ENGINE=InnoDB  DEFAULT CHARSET=utf8;
 
+--
+-- Дамп данных таблицы `user_roles`
+--
+
+INSERT INTO `user_roles` (`ID`, `Type`, `RoleName`, `Mark`) VALUES
+(1, 'student', 'Студент', 1),
+(2, 'teacher', 'Преподаватель', 2),
+(3, 'teacher', 'Преподаватель-Администратор', 4);
+
 --
 -- Ограничения внешнего ключа сохраненных таблиц
 --

deploy.sh

 #source
 if [ -z $1 ] || ![ -d $1 ]
 then
-  s="~/grade-rating/"
+  s=~/grade-rating/
 else
   s=$1
 fi
@@ -9,16 +9,16 @@ fi
 #destination
 if [ -z $2 ] || ![ -d $2 ]
 then
-  d="~/public_html/"
+  d=~/public_html/
 else  
   d=$2
 fi
 
 #shopt -s dotglob
-cp -rp $s"web/*" $d
-mysqladmin -u mmcs_rating -pPefnesdy drop mmcs_rating
+cp -rp ${s}~dev_rating/* $d
+yes | mysqladmin -u mmcs_rating -pPefnesdy drop mmcs_rating
 mysqladmin -u mmcs_rating -pPefnesdy create mmcs_rating
-mysql -u mmcs_rating -pPefnesdy mmcs_rating < $s"db/Structure.sql"
-mysql -u mmcs_rating -pPefnesdy mmcs_rating < $s"db/StoredProcedures.sql"
-mysql -u mmcs_rating -pPefnesdy mmcs_rating < $s"db/Sample.sql"
+mysql -u mmcs_rating -pPefnesdy mmcs_rating < ${s}db/Structure.sql
+mysql -u mmcs_rating -pPefnesdy mmcs_rating < ${s}db/StoredProcedures.sql
+mysql -u mmcs_rating -pPefnesdy mmcs_rating < ${s}db/Sample.sql
 

install.sh

-rm -rf ~/grade-rating
-git clone http://itlab.mmcs.sfedu.ru/git/grade-rating ~/grade-rating
-~/grade-rating/deploy.sh ~/grade-rating ~/public_html
+rm -rf ~/grade-rating/
+git clone http://itlab.mmcs.sfedu.ru/git/grade-rating ~/grade-rating/
+chmod +x ~/grade-rating/deploy.sh
+~/grade-rating/deploy.sh
 

web/.htaccess → ~dev_rating/.htaccess

@@ -3,7 +3,7 @@
 RewriteEngine On
 
 # Installation directory
-RewriteBase /~dev_rating/
+RewriteBase /~dev_rating
 
 # Protect hidden files from being viewed
 <Files .*>

web/application/bootstrap.php → ~dev_rating/application/bootstrap.php

-<?php defined('SYSPATH') or die('No direct script access.');
+<?php defined('SYSPATH') or die('No direct script access.');
 
 // -- Environment setup --------------------------------------------------------
 
@@ -103,7 +103,7 @@ if (isset($_SERVER['KOHANA_ENV']))
  * - boolean  expose      set the X-Powered-By header                        FALSE
  */
 Kohana::init(array(
-	'base_url'   => '/~dev_rating/',
+	'base_url'   => '/~dev_rating',
         'index_file' => FALSE
 ));