diff --git a/sql/swad.sql b/sql/swad.sql index 50b1a007b..109fef05a 100644 --- a/sql/swad.sql +++ b/sql/swad.sql @@ -1148,9 +1148,9 @@ CREATE TABLE IF NOT EXISTS pho_clicks_without_photo ( NumClicks INT NOT NULL, UNIQUE INDEX(UsrCod)); -- --- Table places: stores the places associated to each institution, used in holidays +-- Table plc_places: stores the places associated to each institution, used in holidays -- -CREATE TABLE IF NOT EXISTS places ( +CREATE TABLE IF NOT EXISTS plc_places ( PlcCod INT NOT NULL AUTO_INCREMENT, InsCod INT NOT NULL, ShortName VARCHAR(511) NOT NULL, diff --git a/swad_changelog.h b/swad_changelog.h index cee735230..49a8fb56c 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -600,13 +600,17 @@ TODO: Salvador Romero Cort TODO: FIX BUG, URGENT! En las fechas como parámetro Dat_WriteParamsIniEndDates(), por ejemplo al cambiar el color de la gráfica de accesos por día y hora, no se respeta la zona horaria. */ -#define Log_PLATFORM_VERSION "SWAD 20.51.23 (2021-03-19)" +#define Log_PLATFORM_VERSION "SWAD 20.51.24 (2021-03-19)" #define CSS_FILE "swad20.45.css" #define JS_FILE "swad20.6.2.js" /* TODO: Rename CENTRE to CENTER in help wiki. TODO: Rename ASSESSMENT.Announcements to ASSESSMENT.Calls_for_exams + Version 20.51.24: Mar 19, 2021 Places database table renamed. (308022 lines) + 1 change necessary in database: +RENAME TABLE places TO plc_places; + Version 20.51.23: Mar 19, 2021 Timetable database tables renamed. (308151 lines) 2 changes necessary in database: RENAME TABLE timetable_crs TO tmt_courses; diff --git a/swad_database.c b/swad_database.c index 2d0cbd704..0e84aef51 100644 --- a/swad_database.c +++ b/swad_database.c @@ -2393,9 +2393,9 @@ mysql> DESCRIBE pho_clicks_without_photo; "NumClicks INT NOT NULL," "UNIQUE INDEX(UsrCod))"); - /***** Table places *****/ + /***** Table plc_places *****/ /* -mysql> DESCRIBE places; +mysql> DESCRIBE plc_places; +-----------+---------------+------+-----+---------+----------------+ | Field | Type | Null | Key | Default | Extra | +-----------+---------------+------+-----+---------+----------------+ @@ -2406,7 +2406,7 @@ mysql> DESCRIBE places; +-----------+---------------+------+-----+---------+----------------+ 4 rows in set (0,00 sec) */ - DB_CreateTable ("CREATE TABLE IF NOT EXISTS places (" + DB_CreateTable ("CREATE TABLE IF NOT EXISTS plc_places (" "PlcCod INT NOT NULL AUTO_INCREMENT," "InsCod INT NOT NULL," "ShortName VARCHAR(511) NOT NULL," // Plc_MAX_BYTES_PLACE_SHRT_NAME diff --git a/swad_holiday.c b/swad_holiday.c index fdcaebbca..771e9bb23 100644 --- a/swad_holiday.c +++ b/swad_holiday.c @@ -335,29 +335,30 @@ void Hld_GetListHolidays (struct Hld_Holidays *Holidays) DB_QuerySELECT (&mysql_res,"can not get holidays", "(SELECT hld_holidays.HldCod," // row[0] "hld_holidays.PlcCod," // row[1] - "places.FullName as Place," // row[2] + "plc_places.FullName as Place," // row[2] "hld_holidays.HldTyp," // row[3] "DATE_FORMAT(hld_holidays.StartDate,'%%Y%%m%%d') AS StartDate," // row[4] "DATE_FORMAT(hld_holidays.EndDate,'%%Y%%m%%d') AS EndDate," // row[5] "hld_holidays.Name" // row[6] - " FROM hld_holidays,places" - " WHERE hld_holidays.InsCod=%ld" - " AND hld_holidays.PlcCod=places.PlcCod" - " AND places.InsCod=%ld)" + " FROM hld_holidays," + "plc_places" + " WHERE hld_holidays.InsCod=%ld" + " AND hld_holidays.PlcCod=plc_places.PlcCod" + " AND plc_places.InsCod=%ld)" " UNION " "(SELECT HldCod," // row[0] "PlcCod," // row[1] "'' as Place," // row[2] "HldTyp," // row[3] - "DATE_FORMAT(StartDate,'%%Y%%m%%d') AS StartDate," // row[4] - "DATE_FORMAT(EndDate,'%%Y%%m%%d') AS EndDate," // row[5] + "DATE_FORMAT(StartDate,'%%Y%%m%%d') AS StartDate," // row[4] + "DATE_FORMAT(EndDate,'%%Y%%m%%d') AS EndDate," // row[5] "Name" // row[6] - " FROM hld_holidays" - " WHERE InsCod=%ld" - " AND PlcCod NOT IN" - "(SELECT DISTINCT PlcCod" - " FROM places" - " WHERE InsCod=%ld))" + " FROM hld_holidays" + " WHERE InsCod=%ld" + " AND PlcCod NOT IN" + "(SELECT DISTINCT PlcCod" + " FROM plc_places" + " WHERE InsCod=%ld))" " ORDER BY %s", Gbl.Hierarchy.Ins.InsCod, Gbl.Hierarchy.Ins.InsCod, @@ -449,16 +450,17 @@ static void Hld_GetDataOfHolidayByCod (struct Hld_Holiday *Hld) /***** Get data of holiday from database *****/ if (DB_QuerySELECT (&mysql_res,"can not get data of a holiday", "(SELECT hld_holidays.PlcCod," // row[0] - "places.FullName as Place," // row[1] + "plc_places.FullName as Place," // row[1] "hld_holidays.HldTyp," // row[2] "DATE_FORMAT(hld_holidays.StartDate,'%%Y%%m%%d')," // row[3] "DATE_FORMAT(hld_holidays.EndDate,'%%Y%%m%%d')," // row[4] "hld_holidays.Name" // row[5] - " FROM hld_holidays,places" - " WHERE hld_holidays.HldCod=%ld" - " AND hld_holidays.InsCod=%ld" - " AND hld_holidays.PlcCod=places.PlcCod" - " AND places.InsCod=%ld)" + " FROM hld_holidays," + "plc_places" + " WHERE hld_holidays.HldCod=%ld" + " AND hld_holidays.InsCod=%ld" + " AND hld_holidays.PlcCod=plc_places.PlcCod" + " AND plc_places.InsCod=%ld)" " UNION " "(SELECT PlcCod," "'' as Place," @@ -466,13 +468,13 @@ static void Hld_GetDataOfHolidayByCod (struct Hld_Holiday *Hld) "DATE_FORMAT(StartDate,'%%Y%%m%%d')," "DATE_FORMAT(EndDate,'%%Y%%m%%d')," "Name" - " FROM hld_holidays" - " WHERE HldCod=%ld" - " AND InsCod=%ld" - " AND PlcCod NOT IN" - "(SELECT DISTINCT PlcCod" - " FROM places" - " WHERE InsCod=%ld))", + " FROM hld_holidays" + " WHERE HldCod=%ld" + " AND InsCod=%ld" + " AND PlcCod NOT IN" + "(SELECT DISTINCT PlcCod" + " FROM plc_places" + " WHERE InsCod=%ld))", Hld->HldCod, Gbl.Hierarchy.Ins.InsCod, Gbl.Hierarchy.Ins.InsCod, diff --git a/swad_place.c b/swad_place.c index e8451a8d8..bbeb9d5d0 100644 --- a/swad_place.c +++ b/swad_place.c @@ -365,26 +365,27 @@ void Plc_GetListPlaces (struct Plc_Places *Places) /***** Get places from database *****/ NumRows = DB_QuerySELECT (&mysql_res,"can not get places", - "(SELECT places.PlcCod," - "places.ShortName," - "places.FullName," + "(SELECT plc_places.PlcCod," + "plc_places.ShortName," + "plc_places.FullName," "COUNT(*) AS NumCtrs" - " FROM places," - "ctr_centers" - " WHERE places.InsCod=%ld" - " AND places.PlcCod=ctr_centers.PlcCod" - " AND ctr_centers.InsCod=%ld" - " GROUP BY places.PlcCod)" + " FROM plc_places," + "ctr_centers" + " WHERE plc_places.InsCod=%ld" + " AND plc_places.PlcCod=ctr_centers.PlcCod" + " AND ctr_centers.InsCod=%ld" + " GROUP BY plc_places.PlcCod)" " UNION " "(SELECT PlcCod," "ShortName," "FullName," "0 AS NumCtrs" - " FROM places" - " WHERE InsCod=%ld" - " AND PlcCod NOT IN" - " (SELECT DISTINCT PlcCod FROM ctr_centers" - " WHERE InsCod=%ld))" + " FROM plc_places" + " WHERE InsCod=%ld" + " AND PlcCod NOT IN" + " (SELECT DISTINCT PlcCod" + " FROM ctr_centers" + " WHERE InsCod=%ld))" " ORDER BY %s", Gbl.Hierarchy.Ins.InsCod, Gbl.Hierarchy.Ins.InsCod, @@ -463,23 +464,24 @@ void Plc_GetDataOfPlaceByCod (struct Plc_Place *Plc) { /***** Get data of a place from database *****/ NumRows = DB_QuerySELECT (&mysql_res,"can not get data of a place", - "(SELECT places.ShortName," - "places.FullName," + "(SELECT plc_places.ShortName," + "plc_places.FullName," "COUNT(*)" - " FROM places," - "ctr_centers" - " WHERE places.PlcCod=%ld" - " AND places.PlcCod=ctr_centers.PlcCod" - " AND ctr_centers.PlcCod=%ld" - " GROUP BY places.PlcCod)" + " FROM plc_places," + "ctr_centers" + " WHERE plc_places.PlcCod=%ld" + " AND plc_places.PlcCod=ctr_centers.PlcCod" + " AND ctr_centers.PlcCod=%ld" + " GROUP BY plc_places.PlcCod)" " UNION " "(SELECT ShortName," "FullName," "0" - " FROM places" - " WHERE PlcCod=%ld" - " AND PlcCod NOT IN" - " (SELECT DISTINCT PlcCod FROM ctr_centers))", + " FROM plc_places" + " WHERE PlcCod=%ld" + " AND PlcCod NOT IN" + " (SELECT DISTINCT PlcCod" + " FROM ctr_centers))", Plc->PlcCod, Plc->PlcCod, Plc->PlcCod); @@ -634,7 +636,8 @@ void Plc_RemovePlace (void) { /***** Remove place *****/ DB_QueryDELETE ("can not remove a place", - "DELETE FROM places WHERE PlcCod=%ld", + "DELETE FROM plc_places" + " WHERE PlcCod=%ld", Plc_EditingPlc->PlcCod); /***** Write message to show the change made *****/ @@ -756,9 +759,11 @@ static bool Plc_CheckIfPlaceNameExists (const char *FieldName,const char *Name,l /***** Get number of places with a name from database *****/ return (DB_QueryCOUNT ("can not check if the name of a place" " already existed", - "SELECT COUNT(*) FROM places" + "SELECT COUNT(*)" + " FROM plc_places" " WHERE InsCod=%ld" - " AND %s='%s' AND PlcCod<>%ld", + " AND %s='%s'" + " AND PlcCod<>%ld", Gbl.Hierarchy.Ins.InsCod, FieldName,Name,PlcCod) != 0); } @@ -771,8 +776,11 @@ static void Plc_UpdatePlcNameDB (long PlcCod,const char *FieldName,const char *N { /***** Update place changing old name by new name */ DB_QueryUPDATE ("can not update the name of a place", - "UPDATE places SET %s='%s' WHERE PlcCod=%ld", - FieldName,NewPlcName,PlcCod); + "UPDATE plc_places" + " SET %s='%s'" + " WHERE PlcCod=%ld", + FieldName,NewPlcName, + PlcCod); } /*****************************************************************************/