Marown/swad-core
Marown
/
swad-core
mirror of https://github.com/acanas/swad-core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Version 18.26.2

This commit is contained in:
Antonio Cañas Vargas 2019-01-02 22:34:08 +01:00
parent 75ddfa7385
commit 9eb9a8bafd
5 changed files with 28 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sql/swad.sql
View File

@ -186,6 +186,7 @@ CREATE TABLE IF NOT EXISTS classrooms (
ShortName VARCHAR(511) NOT NULL,
FullName VARCHAR(2047) NOT NULL,
Capacity INT NOT NULL,
Location VARCHAR(2047) NOT NULL,
UNIQUE INDEX(ClaCod),
INDEX(CtrCod));
--

6
swad_changelog.h
View File

@ -364,10 +364,14 @@ En OpenSWAD:
ps2pdf source.ps destination.pdf
*/
#define Log_PLATFORM_VERSION "SWAD 18.26.1 (2019-01-02)"
#define Log_PLATFORM_VERSION "SWAD 18.26.2 (2019-01-02)"
#define CSS_FILE "swad18.22.css"
#define JS_FILE "swad17.17.1.js"
/*
Version 18.26.2: Jan 02, 2019 New field location in classrooms table. (238711 lines)
1 change necessary in database:
ALTER TABLE classrooms ADD COLUMN Location VARCHAR(2047) NOT NULL AFTER Capacity;
Version 18.26.1: Jan 02, 2019 "Maximum number of students" in a classroom is changed to "(seating) capacity". (238702 lines)
2 changes necessary in database:
ALTER TABLE classrooms CHANGE COLUMN MaxStudents Capacity INT NOT NULL;

8
swad_classroom.c
View File

@ -450,7 +450,7 @@ static void Cla_ListClassroomsForEdition (void)
Cla->ClaCod);
/* Classroom short name */
fprintf (Gbl.F.Out,"<td class=\"CENTER_MIDDLE\">");
fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE\">");
Frm_StartForm (ActRenClaSho);
Cla_PutParamClaCod (Cla->ClaCod);
fprintf (Gbl.F.Out,"<input type=\"text\" name=\"ShortName\""
@ -462,7 +462,7 @@ static void Cla_ListClassroomsForEdition (void)
fprintf (Gbl.F.Out,"</td>");
/* Classroom full name */
fprintf (Gbl.F.Out,"<td class=\"CENTER_MIDDLE\">");
fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE\">");
Frm_StartForm (ActRenClaFul);
Cla_PutParamClaCod (Cla->ClaCod);
fprintf (Gbl.F.Out,"<input type=\"text\" name=\"FullName\""
@ -474,7 +474,7 @@ static void Cla_ListClassroomsForEdition (void)
fprintf (Gbl.F.Out,"</td>");
/* Seating capacity */
fprintf (Gbl.F.Out,"<td class=\"CENTER_MIDDLE\">");
fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE\">");
Frm_StartForm (ActChgClaMaxStd);
Cla_PutParamClaCod (Cla->ClaCod);
fprintf (Gbl.F.Out,"<input type=\"text\" name=\"Capacity\""
@ -842,7 +842,7 @@ static void Cla_PutHeadClassrooms (void)
"<th class=\"LEFT_MIDDLE\">"
"%s"
"</th>"
"<th class=\"RIGHT_MIDDLE\">"
"<th class=\"LEFT_MIDDLE\">"
"%s"
"</th>"
"</tr>",

6
swad_classroom.h
View File

@ -43,13 +43,17 @@
#define Cla_UNLIMITED_CAPACITY INT_MAX // This number can be stored in database as an integer...
// ...and means that a classroom has no limited capacity
#define Cla_MAX_CHARS_LOCATION (128 - 1) // 127
#define Cla_MAX_BYTES_LOCATION ((Cla_MAX_CHARS_LOCATION + 1) * Str_MAX_BYTES_PER_CHAR - 1) // 2047
struct Classroom
{
long ClaCod;
long InsCod;
char ShrtName[Cla_MAX_BYTES_CLASSROOM_SHRT_NAME + 1];
char FullName[Cla_MAX_BYTES_CLASSROOM_FULL_NAME + 1];
unsigned Capacity; // Seating capacity (maximum number of people that fit in the room)
unsigned Capacity; // Seating capacity (maximum number of people that fit in the room)
char Location[Cla_MAX_BYTES_LOCATION + 1]; // Examples: Ground floor, first floor, basement
};
#define Cla_NUM_ORDERS 2

24
swad_database.c
View File

@ -467,23 +467,25 @@ mysql> DESCRIBE chat;
/***** Table classrooms *****/
/*
mysql> DESCRIBE classrooms;
+-------------+---------------+------+-----+---------+----------------+
| Field | Type | Null | Key | Default | Extra |
+-------------+---------------+------+-----+---------+----------------+
| ClaCod | int(11) | NO | PRI | NULL | auto_increment |
| CtrCod | int(11) | NO | MUL | NULL | |
| ShortName | varchar(511) | NO | | NULL | |
| FullName | varchar(2047) | NO | | NULL | |
| MaxStudents | int(11) | NO | | NULL | |
+-------------+---------------+------+-----+---------+----------------+
5 rows in set (0.00 sec)
+-----------+---------------+------+-----+---------+----------------+
| Field | Type | Null | Key | Default | Extra |
+-----------+---------------+------+-----+---------+----------------+
| ClaCod | int(11) | NO | PRI | NULL | auto_increment |
| CtrCod | int(11) | NO | MUL | NULL | |
| ShortName | varchar(511) | NO | | NULL | |
| FullName | varchar(2047) | NO | | NULL | |
| Capacity | int(11) | NO | | NULL | |
| Location | varchar(2047) | NO | | NULL | |
+-----------+---------------+------+-----+---------+----------------+
6 rows in set (0.00 sec)
*/
DB_CreateTable ("CREATE TABLE IF NOT EXISTS classrooms ("
"ClaCod INT NOT NULL AUTO_INCREMENT,"
"CtrCod INT NOT NULL,"
"ShortName VARCHAR(511) NOT NULL," // Cla_MAX_BYTES_CLASSROOM_SHRT_NAME
"FullName VARCHAR(2047) NOT NULL," // Cla_MAX_BYTES_CLASSROOM_FULL_NAME
"MaxStudents INT NOT NULL,"
"Capacity INT NOT NULL,"
"Location VARCHAR(2047) NOT NULL," // Cla_MAX_BYTES_LOCATION
"UNIQUE INDEX(ClaCod),"
"INDEX(CtrCod))");