From cd38bd567f484c4d17a2d2194474b65821f36579 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Thu, 3 Jan 2019 15:41:26 +0100 Subject: [PATCH] Version 18.27.2 --- swad_changelog.h | 3 +- swad_classroom.c | 11 ++++-- swad_classroom.h | 9 ++--- swad_text.c | 92 ++++++++++++++++++++++++++++++++++-------------- 4 files changed, 81 insertions(+), 34 deletions(-) diff --git a/swad_changelog.h b/swad_changelog.h index 1ef5e2a2d..96c8efe5c 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -364,10 +364,11 @@ En OpenSWAD: ps2pdf source.ps destination.pdf */ -#define Log_PLATFORM_VERSION "SWAD 18.27.1 (2019-01-03)" +#define Log_PLATFORM_VERSION "SWAD 18.27.2 (2019-01-03)" #define CSS_FILE "swad18.22.css" #define JS_FILE "swad17.17.1.js" /* + Version 18.27.2: Jan 03, 2019 Short name and full name in listing of classrooms. (238847 lines) Version 18.27.1: Jan 03, 2019 New field in forms of classrooms for location. (238800 lines) 1 change necessary in database: INSERT INTO actions (ActCod,Language,Obsolete,Txt) VALUES ('1751','es','N','Cambiar ubicación aula'); diff --git a/swad_classroom.c b/swad_classroom.c index 87ae545d3..c2c7326d9 100644 --- a/swad_classroom.c +++ b/swad_classroom.c @@ -132,7 +132,11 @@ void Cla_SeeClassrooms (void) "" "%s" "" + "" + "%s" + "" "", + Gbl.Classrooms.Lst[NumCla].ShrtName, Gbl.Classrooms.Lst[NumCla].FullName); Cla_WriteCapacity (Gbl.Classrooms.Lst[NumCla].Capacity); fprintf (Gbl.F.Out,"" @@ -267,9 +271,10 @@ void Cla_GetListClassrooms (void) { static const char *OrderBySubQuery[Cla_NUM_ORDERS] = { - "FullName", // Cla_ORDER_BY_CLASSROOM - "Capacity DESC,FullName", // Cla_ORDER_BY_CAPACITY - "Location,FullName", // Cla_ORDER_BY_LOCATION + "ShortName", // Cla_ORDER_BY_SHRT_NAME + "FullName", // Cla_ORDER_BY_FULL_NAME + "Capacity DESC,ShortName", // Cla_ORDER_BY_CAPACITY + "Location,ShortName", // Cla_ORDER_BY_LOCATION }; MYSQL_RES *mysql_res; MYSQL_ROW row; diff --git a/swad_classroom.h b/swad_classroom.h index 3dae510f0..8856a725f 100644 --- a/swad_classroom.h +++ b/swad_classroom.h @@ -56,12 +56,13 @@ struct Classroom char Location[Cla_MAX_BYTES_LOCATION + 1]; // Examples: Ground floor, first floor, basement }; -#define Cla_NUM_ORDERS 3 +#define Cla_NUM_ORDERS 4 typedef enum { - Cla_ORDER_BY_CLASSROOM = 0, - Cla_ORDER_BY_CAPACITY = 1, - Cla_ORDER_BY_LOCATION = 2, + Cla_ORDER_BY_SHRT_NAME = 0, + Cla_ORDER_BY_FULL_NAME = 1, + Cla_ORDER_BY_CAPACITY = 2, + Cla_ORDER_BY_LOCATION = 3, } Cla_Order_t; #define Cla_ORDER_DEFAULT Cla_ORDER_BY_LOCATION diff --git a/swad_text.c b/swad_text.c index 2e8ebdb83..b58b8019e 100644 --- a/swad_text.c +++ b/swad_text.c @@ -3895,27 +3895,47 @@ const char *Txt_Classroom_X_removed = // Warning: it is very important to includ #endif const char *Txt_CLASSROOMS_HELP_ORDER[Cla_NUM_ORDERS] = - { + { // Cla_ORDER_BY_SHRT_NAME #if L==1 // ca - "Ordenar per aula" + "Ordenar per nom breu" #elif L==2 // de - "Nach Klassenzimmer sortieren" + "Nach Kurzname sortieren" #elif L==3 // en - "Sort by classroom" + "Sort by short name" #elif L==4 // es - "Ordenar por aula" + "Ordenar por nombre breve" #elif L==5 // fr - "Trier par salle de classe" + "Trier par nom abrégé" #elif L==6 // gn - "Ordenar por aula" // Okoteve traducción + "Ordenar por nombre breve" // Okoteve traducción #elif L==7 // it - "Ordina per aula" + "Ordina per nome breve" #elif L==8 // pl - "Sortuj wedlug klasa" + "Sortuj według krótkiej nazwy" #elif L==9 // pt - "Classificar por sala de aula" + "Classificar por nome abreviado" #endif - , + , // Cla_ORDER_BY_FULL_NAME +#if L==1 // ca + "Ordenar per nom complet" +#elif L==2 // de + "Nach vollständiger Name sortieren" +#elif L==3 // en + "Sort by full name" +#elif L==4 // es + "Ordenar por nombre completo" +#elif L==5 // fr + "Trier par nom complet" +#elif L==6 // gn + "Ordenar por nombre completo" // Okoteve traducción +#elif L==7 // it + "Ordina per nome completo" +#elif L==8 // pl + "Sortuj według pełna nazwa" +#elif L==9 // pt + "Classificar por nome completo" +#endif + , // Cla_ORDER_BY_CAPACITY #if L==1 // ca "Ordenar per aforo" #elif L==2 // de @@ -3935,7 +3955,7 @@ const char *Txt_CLASSROOMS_HELP_ORDER[Cla_NUM_ORDERS] = #elif L==9 // pt "Ordenar por capacidade" #endif - , + , // Cla_ORDER_BY_LOCATION #if L==1 // ca "Ordenar per ubicació" #elif L==2 // de @@ -3951,34 +3971,54 @@ const char *Txt_CLASSROOMS_HELP_ORDER[Cla_NUM_ORDERS] = #elif L==7 // it "Ordina per posizione" #elif L==8 // pl - "Sortuj wedlug lokacja" + "Sortuj według lokacja" #elif L==9 // pt "Classificar por localização" #endif }; const char *Txt_CLASSROOMS_ORDER[Cla_NUM_ORDERS] = - { + { // Cla_ORDER_BY_SHRT_NAME #if L==1 // ca - "Aula" + "Nom breu" #elif L==2 // de - "Klassenzimmer" + "Kurzname" #elif L==3 // en - "Classroom" + "Short name" #elif L==4 // es - "Aula" + "Nombre breve" #elif L==5 // fr - "Salle de classe" + "Nom abrégé" #elif L==6 // gn - "Mbo'ehakoty" + "Nombre breve" // Okoteve traducción #elif L==7 // it - "Aula" + "Nome breve" #elif L==8 // pl - "Klasa" + "Krótkiej nazwy" #elif L==9 // pt - "Sala de aula" + "Nome abreviado" #endif - , + , // Cla_ORDER_BY_FULL_NAME +#if L==1 // ca + "Nom complet" +#elif L==2 // de + "Vollständiger Name" +#elif L==3 // en + "Full name" +#elif L==4 // es + "Nombre completo" +#elif L==5 // fr + "Nom complet" +#elif L==6 // gn + "Nombre completo" // Okoteve traducción +#elif L==7 // it + "Nome completo" +#elif L==8 // pl + "Pełna nazwa" +#elif L==9 // pt + "Nome completo" +#endif + , // Cla_ORDER_BY_CAPACITY #if L==1 // ca "Aforo" #elif L==2 // de @@ -3998,7 +4038,7 @@ const char *Txt_CLASSROOMS_ORDER[Cla_NUM_ORDERS] = #elif L==9 // pt "Capacidade" #endif - , + , // // Cla_ORDER_BY_LOCATION #if L==1 // ca "Ubicació" #elif L==2 // de @@ -13102,7 +13142,7 @@ const char *Txt_Full_name = #elif L==7 // it "Nome completo"; #elif L==8 // pl - "Pelne imie i nazwisko"; + "Pełna nazwa"; #elif L==9 // pt "Nome completo"; #endif