Marown/swad-core
Marown/swad-core
1
0
Fork 0
mirror of https://github.com/acanas/swad-core.git synced 2024-06-13 04:04:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

Version 16.155.9

Browse Source
This commit is contained in:
Antonio Cañas Vargas 2017-03-11 21:14:38 +01:00
parent 82c5d58812
commit f415a34cbc
4 changed files with 39 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sql/swad.sql
View File

@ -416,8 +416,8 @@ CREATE TABLE IF NOT EXISTS degrees (
CREATE TABLE IF NOT EXISTS departments ( CREATE TABLE IF NOT EXISTS departments (
DptCod INT NOT NULL AUTO_INCREMENT, DptCod INT NOT NULL AUTO_INCREMENT,
InsCod INT NOT NULL, InsCod INT NOT NULL,
ShortName VARCHAR(32) NOT NULL, ShortName VARCHAR(511) NOT NULL,
FullName VARCHAR(127) NOT NULL, FullName VARCHAR(2047) NOT NULL,
WWW VARCHAR(255) NOT NULL, WWW VARCHAR(255) NOT NULL,
UNIQUE INDEX(DptCod), UNIQUE INDEX(DptCod),
INDEX(InsCod)); INDEX(InsCod));

5
swad_changelog.h
View File

@ -214,6 +214,11 @@
// Number of lines (includes comments but not blank lines) has been got with the following command: // Number of lines (includes comments but not blank lines) has been got with the following command:
// nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*?.h sql/swad*.sql | tail -1 // nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*?.h sql/swad*.sql | tail -1
/* /*
Version 16.155.8: Mar 11, 2017 Adjusting size of database fields. (216684 lines)
2 changes necessary in database:
ALTER TABLE departments CHANGE COLUMN ShortName ShortName VARCHAR(511) NOT NULL;
ALTER TABLE departments CHANGE COLUMN FullName FullName VARCHAR(2047) NOT NULL;
Version 16.155.8: Mar 11, 2017 Adjusting size of database fields. (216684 lines) Version 16.155.8: Mar 11, 2017 Adjusting size of database fields. (216684 lines)
2 changes necessary in database: 2 changes necessary in database:
ALTER TABLE degrees CHANGE COLUMN ShortName ShortName VARCHAR(511) COLLATE latin1_spanish_ci NOT NULL; ALTER TABLE degrees CHANGE COLUMN ShortName ShortName VARCHAR(511) COLLATE latin1_spanish_ci NOT NULL;

34
swad_database.c
View File

@ -918,25 +918,25 @@ mysql> DESCRIBE degrees;
/***** Table departments *****/ /***** Table departments *****/
/* /*
mysql> DESCRIBE departments; mysql> DESCRIBE departments;
+-----------+--------------+------+-----+---------+----------------+ +-----------+---------------+------+-----+---------+----------------+
| Field | Type | Null | Key | Default | Extra | | Field | Type | Null | Key | Default | Extra |
+-----------+--------------+------+-----+---------+----------------+ +-----------+---------------+------+-----+---------+----------------+
| DptCod | int(11) | NO | PRI | NULL | auto_increment | | DptCod | int(11) | NO | PRI | NULL | auto_increment |
| InsCod | int(11) | NO | MUL | NULL | | | InsCod | int(11) | NO | MUL | NULL | |
| ShortName | varchar(32) | NO | | NULL | | | ShortName | varchar(511) | NO | | NULL | |
| FullName | varchar(127) | NO | | NULL | | | FullName | varchar(2047) | NO | | NULL | |
| WWW | varchar(255) | NO | | NULL | | | WWW | varchar(255) | NO | | NULL | |
+-----------+--------------+------+-----+---------+----------------+ +-----------+---------------+------+-----+---------+----------------+
5 rows in set (0.00 sec) 5 rows in set (0,00 sec)
*/ */
DB_CreateTable ("CREATE TABLE IF NOT EXISTS departments (" DB_CreateTable ("CREATE TABLE IF NOT EXISTS departments ("
"DptCod INT NOT NULL AUTO_INCREMENT," "DptCod INT NOT NULL AUTO_INCREMENT,"
"InsCod INT NOT NULL," "InsCod INT NOT NULL,"
"ShortName VARCHAR(32) NOT NULL," "ShortName VARCHAR(511) NOT NULL," // Hie_MAX_BYTES_SHRT_NAME
"FullName VARCHAR(127) NOT NULL," "FullName VARCHAR(2047) NOT NULL," // Hie_MAX_BYTES_FULL_NAME
"WWW VARCHAR(255) NOT NULL," "WWW VARCHAR(255) NOT NULL," // Cns_MAX_BYTES_WWW
"UNIQUE INDEX(DptCod)," "UNIQUE INDEX(DptCod),"
"INDEX(InsCod))"); "INDEX(InsCod))");
/***** Table exam_announcements *****/ /***** Table exam_announcements *****/
/* /*

28
swad_department.c
View File

@ -474,8 +474,7 @@ unsigned Dpt_GetNumDepartmentsInInstitution (long InsCod)
char Query[128]; char Query[128];
/***** Get number of departments in an institution from database *****/ /***** Get number of departments in an institution from database *****/
sprintf (Query,"SELECT COUNT(*) FROM departments" sprintf (Query,"SELECT COUNT(*) FROM departments WHERE InsCod='%ld'",
" WHERE InsCod='%ld'",
InsCod); InsCod);
return (unsigned) DB_QueryCOUNT (Query,"can not get number of departments in an institution"); return (unsigned) DB_QueryCOUNT (Query,"can not get number of departments in an institution");
} }
@ -628,7 +627,7 @@ void Dpt_RemoveDepartment (void)
{ {
extern const char *Txt_To_remove_a_department_you_must_first_remove_all_teachers_in_the_department; extern const char *Txt_To_remove_a_department_you_must_first_remove_all_teachers_in_the_department;
extern const char *Txt_Department_X_removed; extern const char *Txt_Department_X_removed;
char Query[512]; char Query[128];
struct Department Dpt; struct Department Dpt;
/***** Get department code *****/ /***** Get department code *****/
@ -644,12 +643,12 @@ void Dpt_RemoveDepartment (void)
else // Department has no teachers ==> remove it else // Department has no teachers ==> remove it
{ {
/***** Remove department *****/ /***** Remove department *****/
sprintf (Query,"DELETE FROM departments WHERE DptCod='%ld'",Dpt.DptCod); sprintf (Query,"DELETE FROM departments WHERE DptCod='%ld'",
Dpt.DptCod);
DB_QueryDELETE (Query,"can not remove a department"); DB_QueryDELETE (Query,"can not remove a department");
/***** Write message to show the change made *****/ /***** Write message to show the change made *****/
sprintf (Gbl.Message,Txt_Department_X_removed, sprintf (Gbl.Message,Txt_Department_X_removed,Dpt.FullName);
Dpt.FullName);
Lay_ShowAlert (Lay_SUCCESS,Gbl.Message); Lay_ShowAlert (Lay_SUCCESS,Gbl.Message);
} }
@ -665,7 +664,7 @@ void Dpt_ChangeDepartIns (void)
{ {
extern const char *Txt_The_institution_of_the_department_has_changed; extern const char *Txt_The_institution_of_the_department_has_changed;
struct Department *Dpt; struct Department *Dpt;
char Query[512]; char Query[128];
Dpt = &Gbl.Dpts.EditingDpt; Dpt = &Gbl.Dpts.EditingDpt;
@ -834,7 +833,7 @@ void Dpt_ChangeDptWWW (void)
extern const char *Txt_The_new_web_address_is_X; extern const char *Txt_The_new_web_address_is_X;
extern const char *Txt_You_can_not_leave_the_web_address_empty; extern const char *Txt_You_can_not_leave_the_web_address_empty;
struct Department *Dpt; struct Department *Dpt;
char Query[256 + Cns_MAX_BYTES_WWW]; char Query[128 + Cns_MAX_BYTES_WWW];
char NewWWW[Cns_MAX_BYTES_WWW + 1]; char NewWWW[Cns_MAX_BYTES_WWW + 1];
Dpt = &Gbl.Dpts.EditingDpt; Dpt = &Gbl.Dpts.EditingDpt;
@ -1084,7 +1083,10 @@ void Dpt_RecFormNewDpt (void)
static void Dpt_CreateDepartment (struct Department *Dpt) static void Dpt_CreateDepartment (struct Department *Dpt)
{ {
extern const char *Txt_Created_new_department_X; extern const char *Txt_Created_new_department_X;
char Query[1024]; char Query[256 +
Hie_MAX_BYTES_SHRT_NAME +
Hie_MAX_BYTES_FULL_NAME +
Cns_MAX_BYTES_WWW];
/***** Create a new department *****/ /***** Create a new department *****/
sprintf (Query,"INSERT INTO departments (InsCod,ShortName,FullName,WWW)" sprintf (Query,"INSERT INTO departments (InsCod,ShortName,FullName,WWW)"
@ -1104,7 +1106,7 @@ static void Dpt_CreateDepartment (struct Department *Dpt)
unsigned Dpt_GetTotalNumberOfDepartments (void) unsigned Dpt_GetTotalNumberOfDepartments (void)
{ {
char Query[512]; char Query[128];
/***** Get number of departments from database *****/ /***** Get number of departments from database *****/
sprintf (Query,"SELECT COUNT(*) FROM departments"); sprintf (Query,"SELECT COUNT(*) FROM departments");
@ -1117,11 +1119,11 @@ unsigned Dpt_GetTotalNumberOfDepartments (void)
unsigned Dpt_GetNumberOfDepartmentsInInstitution (long InsCod) unsigned Dpt_GetNumberOfDepartmentsInInstitution (long InsCod)
{ {
char Query[512]; char Query[128];
/***** Get departments in an institution from database *****/ /***** Get departments in an institution from database *****/
sprintf (Query,"SELECT COUNT(*) FROM departments" sprintf (Query,"SELECT COUNT(*) FROM departments WHERE InsCod='%ld'",
" WHERE InsCod='%ld'",InsCod); InsCod);
return (unsigned) DB_QueryCOUNT (Query,"can not get number of departments in an institution"); return (unsigned) DB_QueryCOUNT (Query,"can not get number of departments in an institution");
} }