diff --git a/css/swad16.156.1.css b/css/swad16.156.1.css index f3df08632..5a8944194 100644 --- a/css/swad16.156.1.css +++ b/css/swad16.156.1.css @@ -3093,12 +3093,13 @@ a:hover img.CENTRE_PHOTO_SHOW { width:90px; } +/* .STATUS { min-width:90px; text-align:left; vertical-align:middle; - } + } */ .INPUT_STATUS { width:80px; diff --git a/swad_centre.c b/swad_centre.c index 2ce2038a1..0c74ab089 100644 --- a/swad_centre.c +++ b/swad_centre.c @@ -836,7 +836,7 @@ static void Ctr_ListOneCentreForSeeing (struct Centre *Ctr,unsigned NumCtr) const char *TxtClassNormal; const char *TxtClassStrong; const char *BgColor; - Crs_StatusTxt_t StatusTxt; + Ctr_StatusTxt_t StatusTxt; /***** Get data of place of this centre *****/ Plc.PlcCod = Ctr->PlcCod; @@ -906,12 +906,12 @@ static void Ctr_ListOneCentreForSeeing (struct Centre *Ctr,unsigned NumCtr) /***** Centre status *****/ StatusTxt = Ctr_GetStatusTxtFromStatusBits (Ctr->Status); - fprintf (Gbl.F.Out,"" - "%s" - "" - "", - TxtClassNormal,BgColor, - Txt_CENTRE_STATUS[StatusTxt]); + fprintf (Gbl.F.Out,"", + TxtClassNormal,BgColor); + if (StatusTxt != Ctr_STATUS_ACTIVE) // If active ==> do not show anything + fprintf (Gbl.F.Out,"%s",Txt_CENTRE_STATUS[StatusTxt]); + fprintf (Gbl.F.Out,"" + ""); Gbl.RowEvenOdd = 1 - Gbl.RowEvenOdd; } @@ -1545,9 +1545,20 @@ static void Ctr_ListCentresForEdition (void) "", Ctr->NumUsrs); + /* Centre requester */ + UsrDat.UsrCod = Ctr->RequesterUsrCod; + Usr_ChkUsrCodAndGetAllUsrDataFromUsrCod (&UsrDat); + fprintf (Gbl.F.Out,"" + "" + ""); + Msg_WriteMsgAuthor (&UsrDat,"DAT",true,NULL); + fprintf (Gbl.F.Out,"" + "
" + ""); + /* Centre status */ StatusTxt = Ctr_GetStatusTxtFromStatusBits (Ctr->Status); - fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,""); if (Gbl.Usrs.Me.LoggedRole >= Rol_INS_ADM && StatusTxt == Ctr_STATUS_PENDING) { @@ -1565,20 +1576,9 @@ static void Ctr_ListCentresForEdition (void) Txt_CENTRE_STATUS[Ctr_STATUS_ACTIVE]); Act_FormEnd (); } - else + else if (StatusTxt != Ctr_STATUS_ACTIVE) // If active ==> do not show anything fprintf (Gbl.F.Out,"%s",Txt_CENTRE_STATUS[StatusTxt]); - fprintf (Gbl.F.Out,""); - - /* Centre requester */ - UsrDat.UsrCod = Ctr->RequesterUsrCod; - Usr_ChkUsrCodAndGetAllUsrDataFromUsrCod (&UsrDat); - fprintf (Gbl.F.Out,"" - "" - ""); - Msg_WriteMsgAuthor (&UsrDat,"DAT",true,NULL); - fprintf (Gbl.F.Out,"" - "
" - "" + fprintf (Gbl.F.Out,"" ""); } @@ -2402,7 +2402,6 @@ static void Ctr_PutFormToCreateCentre (void) extern const char *Hlp_INSTITUTION_Centres; extern const char *Txt_New_centre_of_INSTITUTION_X; extern const char *Txt_Another_place; - extern const char *Txt_CENTRE_STATUS[Ctr_NUM_STATUS_TXT]; extern const char *Txt_Create_centre; struct Centre *Ctr; unsigned NumPlc; @@ -2499,12 +2498,6 @@ static void Ctr_PutFormToCreateCentre (void) "0" ""); - /***** Centre status *****/ - fprintf (Gbl.F.Out,"" - "%s" - "", - Txt_CENTRE_STATUS[Ctr_STATUS_PENDING]); - /***** Centre requester *****/ fprintf (Gbl.F.Out,"" "" @@ -2512,7 +2505,11 @@ static void Ctr_PutFormToCreateCentre (void) Msg_WriteMsgAuthor (&Gbl.Usrs.Me.UsrDat,"DAT",true,NULL); fprintf (Gbl.F.Out,"" "
" - "" + ""); + + /***** Centre status *****/ + fprintf (Gbl.F.Out,"" + "" ""); /***** Send button and end frame *****/ @@ -2535,7 +2532,6 @@ static void Ctr_PutHeadCentresForSeeing (bool OrderSelectable) extern const char *Txt_Courses_ABBREVIATION; extern const char *Txt_Teachers_ABBREVIATION; extern const char *Txt_Students_ABBREVIATION; - extern const char *Txt_Status; Ctr_Order_t Order; fprintf (Gbl.F.Out,"" @@ -2578,14 +2574,12 @@ static void Ctr_PutHeadCentresForSeeing (bool OrderSelectable) "%s+
%s" "" "" - "%s" "" "", Txt_Place, Txt_Degrees_ABBREVIATION, Txt_Courses_ABBREVIATION, - Txt_Teachers_ABBREVIATION,Txt_Students_ABBREVIATION, - Txt_Status); + Txt_Teachers_ABBREVIATION,Txt_Students_ABBREVIATION); } /*****************************************************************************/ @@ -2603,7 +2597,6 @@ static void Ctr_PutHeadCentresForEdition (void) extern const char *Txt_Degrees_ABBREVIATION; extern const char *Txt_Teachers_ABBREVIATION; extern const char *Txt_Students_ABBREVIATION; - extern const char *Txt_Status; extern const char *Txt_Requester; fprintf (Gbl.F.Out,"" @@ -2637,7 +2630,6 @@ static void Ctr_PutHeadCentresForEdition (void) "%s" "" "" - "%s" "" "", Txt_Code, @@ -2648,7 +2640,6 @@ static void Ctr_PutHeadCentresForEdition (void) Txt_Users, Txt_Degrees_ABBREVIATION, Txt_Teachers_ABBREVIATION,Txt_Students_ABBREVIATION, - Txt_Status, Txt_Requester); } diff --git a/swad_changelog.h b/swad_changelog.h index d86eea502..32936dc97 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -204,18 +204,20 @@ // TODO: En la agenda debe poder repetirse el nombre del evento // TODO: Cuando hay un fallo al rellenar el formulario de nuevo evento en la agenda se borran los datos // TODO: Comprobar cabecera de una orla cuando el ámbito actual es un centro +// TODO: Include type of degree in form of degree configuration /*****************************************************************************/ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 16.156.2 (2017-03-16)" +#define Log_PLATFORM_VERSION "SWAD 16.157 (2017-03-17)" #define CSS_FILE "swad16.156.1.css" #define JS_FILE "swad16.144.js" // 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 /* + Version 16.157: Mar 17, 2017 Changes in edition of institutions, centres, degrees and courses. (217046 lines) Version 16.156.2: Mar 16, 2017 Fixed bug in passwords. (217076 lines) Version 16.156.1: Mar 15, 2017 Force vertical scrollbar. (217078 lines) Version 16.156: Mar 15, 2017 Fixed bug in messages, reported by Francisco Ocaña Lara. (217063 lines) diff --git a/swad_course.c b/swad_course.c index 708894172..89481e99d 100644 --- a/swad_course.c +++ b/swad_course.c @@ -1327,11 +1327,12 @@ static bool Crs_ListCoursesOfAYearForSeeing (unsigned Year) /* Course status */ StatusTxt = Crs_GetStatusTxtFromStatusBits (Crs->Status); - fprintf (Gbl.F.Out,"" - "%s" - "" - "", - TxtClassNormal,BgColor,Txt_COURSE_STATUS[StatusTxt]); + fprintf (Gbl.F.Out,"", + TxtClassNormal,BgColor); + if (StatusTxt != Crs_STATUS_ACTIVE) // If active ==> do not show anything + fprintf (Gbl.F.Out,"%s",Txt_COURSE_STATUS[StatusTxt]); + fprintf (Gbl.F.Out,"" + ""); } } @@ -1520,9 +1521,20 @@ static void Crs_ListCoursesOfAYearForEdition (unsigned Year) "", Crs->NumStds); + /* Course requester */ + UsrDat.UsrCod = Crs->RequesterUsrCod; + Usr_ChkUsrCodAndGetAllUsrDataFromUsrCod (&UsrDat); + fprintf (Gbl.F.Out,"" + "" + ""); + Msg_WriteMsgAuthor (&UsrDat,"DAT",true,NULL); + fprintf (Gbl.F.Out,"" + "
" + ""); + /* Course status */ StatusTxt = Crs_GetStatusTxtFromStatusBits (Crs->Status); - fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,""); if (Gbl.Usrs.Me.LoggedRole >= Rol_DEG_ADM && StatusTxt == Crs_STATUS_PENDING) { @@ -1540,20 +1552,9 @@ static void Crs_ListCoursesOfAYearForEdition (unsigned Year) Txt_COURSE_STATUS[Crs_STATUS_ACTIVE]); Act_FormEnd (); } - else + else if (StatusTxt != Crs_STATUS_ACTIVE) // If active ==> do not show anything fprintf (Gbl.F.Out,"%s",Txt_COURSE_STATUS[StatusTxt]); - fprintf (Gbl.F.Out,""); - - /* Course requester */ - UsrDat.UsrCod = Crs->RequesterUsrCod; - Usr_ChkUsrCodAndGetAllUsrDataFromUsrCod (&UsrDat); - fprintf (Gbl.F.Out,"" - "" - ""); - Msg_WriteMsgAuthor (&UsrDat,"DAT",true,NULL); - fprintf (Gbl.F.Out,"" - "
" - "" + fprintf (Gbl.F.Out,"" ""); } } @@ -1624,7 +1625,6 @@ static void Crs_PutFormToCreateCourse (void) extern const char *Hlp_DEGREE_Courses; extern const char *Txt_New_course_of_DEGREE_X; extern const char *Txt_YEAR_OF_DEGREE[1 + Deg_MAX_YEARS_PER_DEGREE]; - extern const char *Txt_COURSE_STATUS[Crs_NUM_STATUS_TXT]; extern const char *Txt_Create_course; struct Course *Crs; unsigned Year; @@ -1706,11 +1706,6 @@ static void Crs_PutFormToCreateCourse (void) "0" ""); - /***** Course status *****/ - fprintf (Gbl.F.Out,"" - "%s" - "", - Txt_COURSE_STATUS[Crs_STATUS_PENDING]); /***** Course requester *****/ fprintf (Gbl.F.Out,"" @@ -1719,7 +1714,11 @@ static void Crs_PutFormToCreateCourse (void) Msg_WriteMsgAuthor (&Gbl.Usrs.Me.UsrDat,"DAT",true,NULL); fprintf (Gbl.F.Out,"" "" - "" + ""); + + /***** Course status *****/ + fprintf (Gbl.F.Out,"" + "" ""); /***** Send button and end frame *****/ @@ -1740,7 +1739,6 @@ static void Crs_PutHeadCoursesForSeeing (void) extern const char *Txt_Course; extern const char *Txt_Teachers_ABBREVIATION; extern const char *Txt_Students_ABBREVIATION; - extern const char *Txt_Status; fprintf (Gbl.F.Out,"" "" @@ -1760,15 +1758,13 @@ static void Crs_PutHeadCoursesForSeeing (void) "%s" "" "" - "%s" "" "", Txt_Institutional_BR_code, Txt_Year_OF_A_DEGREE, Txt_Course, Txt_Teachers_ABBREVIATION, - Txt_Students_ABBREVIATION, - Txt_Status); + Txt_Students_ABBREVIATION); } /*****************************************************************************/ @@ -1785,7 +1781,6 @@ static void Crs_PutHeadCoursesForEdition (void) extern const char *Txt_Full_name_of_the_course; extern const char *Txt_Teachers_ABBREVIATION; extern const char *Txt_Students_ABBREVIATION; - extern const char *Txt_Status; extern const char *Txt_Requester; fprintf (Gbl.F.Out,"" @@ -1815,7 +1810,6 @@ static void Crs_PutHeadCoursesForEdition (void) "%s" "" "" - "%s" "" "", Txt_Code, @@ -1825,7 +1819,6 @@ static void Crs_PutHeadCoursesForEdition (void) Txt_Full_name_of_the_course, Txt_Teachers_ABBREVIATION, Txt_Students_ABBREVIATION, - Txt_Status, Txt_Requester); } diff --git a/swad_degree.c b/swad_degree.c index a61d9599c..e0e4ca737 100644 --- a/swad_degree.c +++ b/swad_degree.c @@ -839,9 +839,20 @@ static void Deg_ListDegreesForEdition (void) "", NumCrss); + /* Degree requester */ + UsrDat.UsrCod = Deg->RequesterUsrCod; + Usr_ChkUsrCodAndGetAllUsrDataFromUsrCod (&UsrDat); + fprintf (Gbl.F.Out,"" + "" + ""); + Msg_WriteMsgAuthor (&UsrDat,"DAT",true,NULL); + fprintf (Gbl.F.Out,"" + "
" + ""); + /* Degree status */ StatusTxt = Deg_GetStatusTxtFromStatusBits (Deg->Status); - fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,""); if (Gbl.Usrs.Me.LoggedRole >= Rol_CTR_ADM && StatusTxt == Deg_STATUS_PENDING) { @@ -859,20 +870,9 @@ static void Deg_ListDegreesForEdition (void) Txt_DEGREE_STATUS[Deg_STATUS_ACTIVE]); Act_FormEnd (); } - else + else if (StatusTxt != Deg_STATUS_ACTIVE) // If active ==> do not show anything fprintf (Gbl.F.Out,"%s",Txt_DEGREE_STATUS[StatusTxt]); - fprintf (Gbl.F.Out,""); - - /* Degree requester */ - UsrDat.UsrCod = Deg->RequesterUsrCod; - Usr_ChkUsrCodAndGetAllUsrDataFromUsrCod (&UsrDat); - fprintf (Gbl.F.Out,"" - "" - ""); - Msg_WriteMsgAuthor (&UsrDat,"DAT",true,NULL); - fprintf (Gbl.F.Out,"" - "
" - "" + fprintf (Gbl.F.Out,"" ""); } @@ -944,7 +944,6 @@ static void Deg_PutFormToCreateDegree (void) { extern const char *Hlp_CENTRE_Degrees; extern const char *Txt_New_degree_of_CENTRE_X; - extern const char *Txt_DEGREE_STATUS[Deg_NUM_STATUS_TXT]; extern const char *Txt_Create_degree; struct Degree *Deg; struct DegreeType *DegTyp; @@ -1032,12 +1031,6 @@ static void Deg_PutFormToCreateDegree (void) "0" ""); - /***** Degree status *****/ - fprintf (Gbl.F.Out,"" - "%s" - "", - Txt_DEGREE_STATUS[Deg_STATUS_PENDING]); - /***** Degree requester *****/ fprintf (Gbl.F.Out,"" "" @@ -1045,7 +1038,11 @@ static void Deg_PutFormToCreateDegree (void) Msg_WriteMsgAuthor (&Gbl.Usrs.Me.UsrDat,"DAT",true,NULL); fprintf (Gbl.F.Out,"" "
" - "" + ""); + + /***** Degree status *****/ + fprintf (Gbl.F.Out,"" + "" ""); /***** Send button and end frame *****/ @@ -1064,7 +1061,6 @@ static void Deg_PutHeadDegreesForSeeing (void) extern const char *Txt_Degree; extern const char *Txt_Type; extern const char *Txt_Courses_ABBREVIATION; - extern const char *Txt_Status; fprintf (Gbl.F.Out,"" "" @@ -1079,13 +1075,11 @@ static void Deg_PutHeadDegreesForSeeing (void) "%s" "" "" - "%s" "" "", Txt_Degree, Txt_Type, - Txt_Courses_ABBREVIATION, - Txt_Status); + Txt_Courses_ABBREVIATION); } /*****************************************************************************/ @@ -1100,7 +1094,6 @@ static void Deg_PutHeadDegreesForEdition (void) extern const char *Txt_Type; extern const char *Txt_WWW; extern const char *Txt_Courses_ABBREVIATION; - extern const char *Txt_Status; extern const char *Txt_Requester; fprintf (Gbl.F.Out,"" @@ -1128,7 +1121,6 @@ static void Deg_PutHeadDegreesForEdition (void) "%s" "" "" - "%s" "" "", Txt_Code, @@ -1137,7 +1129,6 @@ static void Deg_PutHeadDegreesForEdition (void) Txt_Type, Txt_WWW, Txt_Courses_ABBREVIATION, - Txt_Status, Txt_Requester); } @@ -1288,7 +1279,7 @@ static void Deg_ListOneDegreeForSeeing (struct Degree *Deg,unsigned NumDeg) const char *TxtClassNormal; const char *TxtClassStrong; const char *BgColor; - Crs_StatusTxt_t StatusTxt; + Deg_StatusTxt_t StatusTxt; unsigned NumCrss; /***** Get number of courses in this degree *****/ @@ -1355,11 +1346,12 @@ static void Deg_ListOneDegreeForSeeing (struct Degree *Deg,unsigned NumDeg) /***** Degree status *****/ StatusTxt = Deg_GetStatusTxtFromStatusBits (Deg->Status); - fprintf (Gbl.F.Out,"" - "%s" - "" - "", - TxtClassNormal,BgColor,Txt_DEGREE_STATUS[StatusTxt]); + fprintf (Gbl.F.Out,"", + TxtClassNormal,BgColor); + if (StatusTxt != Deg_STATUS_ACTIVE) // If active ==> do not show anything + fprintf (Gbl.F.Out,"%s",Txt_DEGREE_STATUS[StatusTxt]); + fprintf (Gbl.F.Out,"" + ""); Gbl.RowEvenOdd = 1 - Gbl.RowEvenOdd; } diff --git a/swad_institution.c b/swad_institution.c index 46bbf8693..87b678f27 100644 --- a/swad_institution.c +++ b/swad_institution.c @@ -759,7 +759,7 @@ static void Ins_ListOneInstitutionForSeeing (struct Instit *Ins,unsigned NumIns) const char *TxtClassNormal; const char *TxtClassStrong; const char *BgColor; - Crs_StatusTxt_t StatusTxt; + Ins_StatusTxt_t StatusTxt; if (Ins->Status & Ins_STATUS_BIT_PENDING) { @@ -827,11 +827,12 @@ static void Ins_ListOneInstitutionForSeeing (struct Instit *Ins,unsigned NumIns) /***** Institution status *****/ StatusTxt = Ins_GetStatusTxtFromStatusBits (Ins->Status); - fprintf (Gbl.F.Out,"" - "%s" - "" - "", - TxtClassNormal,BgColor,Txt_INSTITUTION_STATUS[StatusTxt]); + fprintf (Gbl.F.Out,"", + TxtClassNormal,BgColor); + if (StatusTxt != Ins_STATUS_ACTIVE) // If active ==> do not show anything + fprintf (Gbl.F.Out,"%s",Txt_INSTITUTION_STATUS[StatusTxt]); + fprintf (Gbl.F.Out,"" + ""); Gbl.RowEvenOdd = 1 - Gbl.RowEvenOdd; } @@ -850,7 +851,6 @@ static void Ins_PutHeadInstitutionsForSeeing (bool OrderSelectable) extern const char *Txt_Degrees_ABBREVIATION; extern const char *Txt_Courses_ABBREVIATION; extern const char *Txt_Departments_ABBREVIATION; - extern const char *Txt_Status; Ins_Order_t Order; fprintf (Gbl.F.Out,"" @@ -896,15 +896,13 @@ static void Ins_PutHeadInstitutionsForSeeing (bool OrderSelectable) "%s+
%s" "" "" - "%s" "" "", Txt_Centres_ABBREVIATION, Txt_Degrees_ABBREVIATION, Txt_Courses_ABBREVIATION, Txt_Departments_ABBREVIATION, - Txt_Teachers_ABBREVIATION,Txt_Students_ABBREVIATION, - Txt_Status); + Txt_Teachers_ABBREVIATION,Txt_Students_ABBREVIATION); } /*****************************************************************************/ @@ -1528,9 +1526,20 @@ static void Ins_ListInstitutionsForEdition (void) "", Ins->NumUsrs); + /* Institution requester */ + UsrDat.UsrCod = Ins->RequesterUsrCod; + Usr_ChkUsrCodAndGetAllUsrDataFromUsrCod (&UsrDat); + fprintf (Gbl.F.Out,"" + "" + ""); + Msg_WriteMsgAuthor (&UsrDat,"DAT",true,NULL); + fprintf (Gbl.F.Out,"" + "
" + ""); + /* Institution status */ StatusTxt = Ins_GetStatusTxtFromStatusBits (Ins->Status); - fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,""); if (Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM && StatusTxt == Ins_STATUS_PENDING) { @@ -1548,20 +1557,9 @@ static void Ins_ListInstitutionsForEdition (void) Txt_INSTITUTION_STATUS[Ins_STATUS_ACTIVE]); Act_FormEnd (); } - else + else if (StatusTxt != Ins_STATUS_ACTIVE) // If active ==> do not show anything fprintf (Gbl.F.Out,"%s",Txt_INSTITUTION_STATUS[StatusTxt]); - fprintf (Gbl.F.Out,""); - - /* Institution requester */ - UsrDat.UsrCod = Ins->RequesterUsrCod; - Usr_ChkUsrCodAndGetAllUsrDataFromUsrCod (&UsrDat); - fprintf (Gbl.F.Out,"" - "" - ""); - Msg_WriteMsgAuthor (&UsrDat,"DAT",true,NULL); - fprintf (Gbl.F.Out,"" - "
" - "" + fprintf (Gbl.F.Out,"" ""); } @@ -2154,7 +2152,6 @@ static void Ins_PutFormToCreateInstitution (void) { extern const char *Hlp_COUNTRY_Institutions; extern const char *Txt_New_institution_of_COUNTRY_X; - extern const char *Txt_INSTITUTION_STATUS[Ins_NUM_STATUS_TXT]; extern const char *Txt_Create_institution; struct Instit *Ins; @@ -2232,12 +2229,6 @@ static void Ins_PutFormToCreateInstitution (void) "0" ""); - /***** Institution status *****/ - fprintf (Gbl.F.Out,"" - "%s" - "", - Txt_INSTITUTION_STATUS[Ins_STATUS_PENDING]); - /***** Institution requester *****/ fprintf (Gbl.F.Out,"" "" @@ -2245,7 +2236,11 @@ static void Ins_PutFormToCreateInstitution (void) Msg_WriteMsgAuthor (&Gbl.Usrs.Me.UsrDat,"DAT",true,NULL); fprintf (Gbl.F.Out,"" "
" - "" + ""); + + /***** Institution status *****/ + fprintf (Gbl.F.Out,"" + "" ""); /***** Send button and end of frame *****/ @@ -2269,7 +2264,6 @@ static void Ins_PutHeadInstitutionsForEdition (void) extern const char *Txt_Centres_ABBREVIATION; extern const char *Txt_Teachers_ABBREVIATION; extern const char *Txt_Students_ABBREVIATION; - extern const char *Txt_Status; extern const char *Txt_Requester; fprintf (Gbl.F.Out,"" @@ -2300,7 +2294,6 @@ static void Ins_PutHeadInstitutionsForEdition (void) "%s" "" "" - "%s" "" "", Txt_Code, @@ -2310,7 +2303,6 @@ static void Ins_PutHeadInstitutionsForEdition (void) Txt_Users, Txt_Centres_ABBREVIATION, Txt_Teachers_ABBREVIATION,Txt_Students_ABBREVIATION, - Txt_Status, Txt_Requester); } diff --git a/swad_text.c b/swad_text.c index 2eb2ee7b3..1adcd2764 100644 --- a/swad_text.c +++ b/swad_text.c @@ -4021,7 +4021,7 @@ const char *Txt_Centre_X_removed = // Warning: it is very important to include % const char *Txt_CENTRE_STATUS[Crs_NUM_STATUS_TXT] = { -#if L==1 // Crs_STATUS_UNKNOWN +#if L==1 // Ctr_STATUS_UNKNOWN "Desconegudo" #elif L==2 "Unbekannt" @@ -4041,7 +4041,7 @@ const char *Txt_CENTRE_STATUS[Crs_NUM_STATUS_TXT] = "Desconhecido" #endif , -#if L==1 // Crs_STATUS_ACTIVE +#if L==1 // Ctr_STATUS_ACTIVE "Activo" #elif L==2 "Aktive" @@ -4061,27 +4061,27 @@ const char *Txt_CENTRE_STATUS[Crs_NUM_STATUS_TXT] = "Ativo" #endif , -#if L==1 // Crs_STATUS_PENDING - "Pendent" +#if L==1 // Ctr_STATUS_PENDING + "Novo" #elif L==2 - "Offen" + "Neu" #elif L==3 - "Pending" + "New" #elif L==4 - "Pendiente" + "Nuevo" #elif L==5 - "En attente" + "Nouveau" #elif L==6 - "Pendiente" // Okoteve traducción + "Pyahu" #elif L==7 - "In attesa" + "Nuovo" #elif L==8 - "Do czasu" + "Nowy" #elif L==9 - "Pendente" + "Novo" #endif , -#if L==1 // Crs_STATUS_REMOVED +#if L==1 // Ctr_STATUS_REMOVED "Eliminado" #elif L==2 "Entfernt" @@ -5682,23 +5682,23 @@ const char *Txt_COURSE_STATUS[Crs_NUM_STATUS_TXT] = #endif , #if L==1 // Crs_STATUS_PENDING - "Pendent" + "Nova" #elif L==2 - "Offen" + "Neu" #elif L==3 - "Pending" + "New" #elif L==4 - "Pendiente" + "Nueva" #elif L==5 - "En attente" + "Nouvelle" #elif L==6 - "Pendiente" // Okoteve traducción + "Pyahu" #elif L==7 - "In attesa" + "Nuovo" #elif L==8 - "Do czasu" + "Nowy" #elif L==9 - "Pendente" + "Nova" #endif , #if L==1 // Crs_STATUS_REMOVED @@ -7731,23 +7731,23 @@ const char *Txt_DEGREE_STATUS[Deg_NUM_STATUS_TXT] = #endif , #if L==1 // Deg_STATUS_PENDING - "Pendent" + "Nova" #elif L==2 - "Offen" + "Neu" #elif L==3 - "Pending" + "New" #elif L==4 - "Pendiente" + "Nueva" #elif L==5 - "En attente" + "Nouveau" #elif L==6 - "Pendiente" // Okoteve traducción + "Pyahu" #elif L==7 - "In attesa" + "Nuovo" #elif L==8 - "Do czasu" + "Nowy" #elif L==9 - "Pendente" + "Nova" #endif , #if L==1 // Deg_STATUS_REMOVED @@ -16112,23 +16112,23 @@ const char *Txt_INSTITUTION_STATUS[Ins_NUM_STATUS_TXT] = #endif , #if L==1 // Ins_STATUS_PENDING - "Pendent" + "Nova" #elif L==2 - "Offen" + "Neu" #elif L==3 - "Pending" + "New" #elif L==4 - "Pendiente" + "Nueva" #elif L==5 - "En attente" + "Nouvelle" #elif L==6 - "Pendiente" // Okoteve traducción + "Pyahu" #elif L==7 - "In attesa" + "Nuovo" #elif L==8 - "Do czasu" + "Nowy" #elif L==9 - "Pendente" + "Nova" #endif , #if L==1 // Ins_STATUS_REMOVED