"
@@ -2127,9 +2009,6 @@ static void Deg_PutHeadDegreesForEdition (void)
Txt_Short_BR_Name,
Txt_Full_BR_Name,
Txt_Type,
- Txt_First_BR_year,
- Txt_Last_BR_year,
- // Txt_Opt_BR_year,
Txt_WWW,
Txt_Courses_ABBREVIATION,
Txt_Status,
@@ -2187,15 +2066,13 @@ static void Deg_CreateDegree (struct Degree *Deg,unsigned Status)
/***** Create a new degree *****/
sprintf (Query,"INSERT INTO degrees (CtrCod,DegTypCod,Status,RequesterUsrCod,"
- "ShortName,FullName,FirstYear,LastYear,WWW)"
+ "ShortName,FullName,WWW)"
" VALUES ('%ld','%ld','%u','%ld',"
- "'%s','%s','%u','%u','%s')",
+ "'%s','%s','%s')",
Deg->CtrCod,Deg->DegTypCod,
Status,
Gbl.Usrs.Me.UsrDat.UsrCod,
- Deg->ShortName,Deg->FullName,
- Deg->FirstYear,Deg->LastYear,
- Deg->WWW);
+ Deg->ShortName,Deg->FullName,Deg->WWW);
DB_QueryINSERT (Query,"can not create a new degree");
/***** Write success message *****/
@@ -2364,7 +2241,7 @@ void Deg_GetListAllDegs (void)
/***** Get degrees admin by me from database *****/
sprintf (Query,"SELECT DegCod,CtrCod,DegTypCod,Status,RequesterUsrCod,"
- "ShortName,FullName,FirstYear,LastYear,WWW"
+ "ShortName,FullName,WWW"
" FROM degrees ORDER BY FullName");
Gbl.Degs.AllDegs.Num = (unsigned) DB_QuerySELECT (Query,&mysql_res,"can not get degrees admin by you");
@@ -2419,7 +2296,7 @@ static void Deg_GetListDegsOfCurrentCtr (void)
/***** Get degrees of the current centre from database *****/
sprintf (Query,"SELECT DegCod,CtrCod,DegTypCod,Status,RequesterUsrCod,"
- "ShortName,FullName,FirstYear,LastYear,WWW"
+ "ShortName,FullName,WWW"
" FROM degrees WHERE CtrCod='%ld' ORDER BY FullName",
Gbl.CurrentCtr.Ctr.CtrCod);
NumRows = DB_QuerySELECT (Query,&mysql_res,"can not get degrees of a centre");
@@ -2493,7 +2370,7 @@ void Deg_GetListDegsAdminByMe (void)
/***** Get degrees admin by me from database *****/
if (Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM)
sprintf (Query,"SELECT DegCod,CtrCod,DegTypCod,Status,RequesterUsrCod,"
- "ShortName,FullName,FirstYear,LastYear,WWW"
+ "ShortName,FullName,WWW"
" FROM degrees"
" WHERE CtrCod='%ld'"
" ORDER BY ShortName",
@@ -2501,7 +2378,7 @@ void Deg_GetListDegsAdminByMe (void)
// TODO: put an if to select all degrees for admins of all degrees !!!!!!!!!!!!!
else // Gbl.Usrs.Me.LoggedRole == Rol_ROLE_DEG_ADM
sprintf (Query,"SELECT degrees.DegCod,degrees.CtrCod,degrees.DegTypCod,degrees.Status,degrees.RequesterUsrCod,"
- "degrees.ShortName,degrees.FullName,degrees.FirstYear,degrees.LastYear,degrees.WWW"
+ "degrees.ShortName,degrees.FullName,degrees.WWW"
" FROM admin,degrees"
" WHERE admin.UsrCod='%ld' AND admin.Scope='Deg'"
" AND admin.Cod=degrees.DegCod"
@@ -2618,8 +2495,6 @@ static void Deg_RecFormRequestOrCreateDeg (unsigned Status)
extern const char *Txt_You_must_specify_the_web_address_of_the_new_degree;
extern const char *Txt_You_must_specify_the_short_name_and_the_full_name_of_the_new_degree;
struct Degree *Deg;
- char YearStr[2+1];
- // char YN[1+1];
Deg = &Gbl.Degs.EditingDeg;
@@ -2637,14 +2512,6 @@ static void Deg_RecFormRequestOrCreateDeg (unsigned Status)
if ((Deg->DegTypCod = Deg_GetParamOtherDegTypCod ()) <= 0)
Lay_ShowAlert (Lay_ERROR,"Wrong type of degree.");
- /* Get first year */
- Par_GetParToText ("FirstYear",YearStr,2);
- Deg->FirstYear = Deg_ConvStrToYear (YearStr);
-
- /* Get last year */
- Par_GetParToText ("LastYear",YearStr,2);
- Deg->LastYear = Deg_ConvStrToYear (YearStr);
-
/* Get degree WWW */
Par_GetParToText ("WWW",Deg->WWW,Cns_MAX_LENGTH_WWW);
@@ -2905,8 +2772,6 @@ bool Deg_GetDataOfDegreeByCod (struct Degree *Deg)
Deg->RequesterUsrCod = -1L;
Deg->ShortName[0] = '\0';
Deg->FullName[0] = '\0';
- Deg->FirstYear = 0;
- Deg->LastYear = 0;
Deg->WWW[0] = '\0';
Deg->NumCrss = 0;
Deg->LstCrss = NULL;
@@ -2915,7 +2780,7 @@ bool Deg_GetDataOfDegreeByCod (struct Degree *Deg)
/***** Get data of a degree from database *****/
sprintf (Query,"SELECT DegCod,CtrCod,DegTypCod,Status,RequesterUsrCod,"
- "ShortName,FullName,FirstYear,LastYear,WWW"
+ "ShortName,FullName,WWW"
" FROM degrees WHERE DegCod ='%ld'",
Deg->DegCod);
NumRows = DB_QuerySELECT (Query,&mysql_res,"can not get data of a degree");
@@ -2937,8 +2802,6 @@ bool Deg_GetDataOfDegreeByCod (struct Degree *Deg)
Deg->RequesterUsrCod = -1L;
Deg->ShortName[0] = '\0';
Deg->FullName[0] = '\0';
- Deg->FirstYear = 0;
- Deg->LastYear = 0;
Deg->WWW[0] = '\0';
Deg->NumCrss = 0;
Deg->LstCrss = NULL;
@@ -2982,14 +2845,8 @@ static void Deg_GetDataOfDegreeFromRow (struct Degree *Deg,MYSQL_ROW row)
/***** Get degree full name (row[6]) *****/
strcpy (Deg->FullName,row[6]);
- /***** Get first year (row[7]) *****/
- Deg->FirstYear = Deg_ConvStrToYear (row[7]);
-
- /***** Get last year (row[8]) *****/
- Deg->LastYear = Deg_ConvStrToYear (row[8]);
-
- /***** Get WWW (row[9]) *****/
- strcpy (Deg->WWW,row[9]);
+ /***** Get WWW (row[7]) *****/
+ strcpy (Deg->WWW,row[7]);
/***** Get number of courses *****/
Deg->NumCrss = Crs_GetNumCrssInDeg (Deg->DegCod);
@@ -3550,72 +3407,6 @@ void Deg_ChangeDegreeCtr (void)
Deg_EditDegrees ();
}
-/*****************************************************************************/
-/********************** Change the first year of a degree ********************/
-/*****************************************************************************/
-
-void Deg_ChangeDegFirstYear (void)
- {
- Deg_ChangeDegYear (&Gbl.Degs.EditingDeg,Deg_FIRST_YEAR);
- }
-
-/*****************************************************************************/
-/*********************** Change the last year of a degree ********************/
-/*****************************************************************************/
-
-void Deg_ChangeDegLastYear (void)
- {
- Deg_ChangeDegYear (&Gbl.Degs.EditingDeg,Deg_LAST_YEAR);
- }
-
-/*****************************************************************************/
-/******************* Change the first/last year of a degree ******************/
-/*****************************************************************************/
-
-static void Deg_ChangeDegYear (struct Degree *Deg,Deg_FirstOrLastYear_t FirstOrLastYear)
- {
- extern const char *Txt_The_years_of_the_degree_have_changed;
- char Query[512];
- char YearStr[2+1];
- const char *ParamName = NULL; // Initialized to avoid warning
- const char *FieldName = NULL; // Initialized to avoid warning
- unsigned *PtrYear = NULL; // Initialized to avoid warning
-
- switch (FirstOrLastYear)
- {
- case Deg_FIRST_YEAR:
- ParamName = "FirstYear";
- FieldName = "FirstYear";
- PtrYear = &(Deg->FirstYear);
- break;
- case Deg_LAST_YEAR:
- ParamName = "LastYear";
- FieldName = "LastYear";
- PtrYear = &(Deg->LastYear);
- break;
- }
-
- /***** Get parameters from form *****/
- /* Get degree code */
- if ((Deg->DegCod = Deg_GetParamOtherDegCod ()) == -1L)
- Lay_ShowErrorAndExit ("Code of degree is missing.");
-
- /* Get parameter with first/last year */
- Par_GetParToText (ParamName,YearStr,2);
- *PtrYear = Deg_ConvStrToYear (YearStr);
-
- /***** Update first/last year in table of degrees *****/
- sprintf (Query,"UPDATE degrees SET %s='%u' WHERE DegCod='%ld'",
- FieldName,*PtrYear,Deg->DegCod);
- DB_QueryUPDATE (Query,"can not update the number of years of a degree");
-
- /***** Write message to show the change made *****/
- Lay_ShowAlert (Lay_SUCCESS,Txt_The_years_of_the_degree_have_changed);
-
- /***** Show the form again *****/
- Deg_EditDegrees ();
- }
-
/*****************************************************************************/
/************************* Change the WWW of a degree ************************/
/*****************************************************************************/
@@ -3834,16 +3625,6 @@ unsigned Deg_GetNumDegsWithUsrs (Rol_Role_t Role,const char *SubQuery)
return (unsigned) DB_QueryCOUNT (Query,"can not get number of degrees with users");
}
-/*****************************************************************************/
-/******************* Check if a year is valid in a degree ********************/
-/*****************************************************************************/
-
-bool Deg_CheckIfYearIsValidInDeg (unsigned Year,struct Degree *Deg)
- {
- return (Year == 0) ||
- (Year != 0 && Year >= Deg->FirstYear && Year <= Deg->LastYear);
- }
-
/*****************************************************************************/
/***** Write institutions, centres and degrees administrated by an admin *****/
/*****************************************************************************/
diff --git a/swad_degree.h b/swad_degree.h
index e0968c4d9..716081ee9 100644
--- a/swad_degree.h
+++ b/swad_degree.h
@@ -76,8 +76,6 @@ struct Degree
long RequesterUsrCod; // User code of the person who requested the creation of this degree
char ShortName[Deg_MAX_LENGTH_DEGREE_SHORT_NAME+1]; // Short name of degree
char FullName[Deg_MAX_LENGTH_DEGREE_FULL_NAME+1]; // Full name of degree
- unsigned FirstYear;
- unsigned LastYear;
char WWW[Cns_MAX_LENGTH_WWW+1];
unsigned NumCrss; // Number of courses in the degree
struct Course *LstCrss; // List of courses in this degree
@@ -144,8 +142,6 @@ void Deg_RenameDegreeFull (void);
void Deg_ChangeDegTypeLogIn (void);
void Deg_ChangeDegreeType (void);
void Deg_ChangeDegreeCtr (void);
-void Deg_ChangeDegFirstYear (void);
-void Deg_ChangeDegLastYear (void);
void Deg_ChangeDegWWW (void);
void Deg_ChangeDegStatus (void);
void Deg_RequestLogo (void);
@@ -159,8 +155,6 @@ unsigned Deg_GetNumDegsInCtr (long CtrCod);
unsigned Deg_GetNumDegsWithCrss (const char *SubQuery);
unsigned Deg_GetNumDegsWithUsrs (Rol_Role_t Role,const char *SubQuery);
-bool Deg_CheckIfYearIsValidInDeg (unsigned Year,struct Degree *Deg);
-
void Deg_GetAndWriteInsCtrDegAdminBy (long UsrCod,unsigned ColSpan);
unsigned Deg_ListDegsFound (const char *Query);
diff --git a/swad_global.c b/swad_global.c
index 9846963fd..f8c395d59 100644
--- a/swad_global.c
+++ b/swad_global.c
@@ -305,8 +305,6 @@ void Gbl_InitializeGlobals (void)
Gbl.Degs.EditingDeg.DegCod = -1L;
Gbl.Degs.EditingDeg.ShortName[0] = '\0';
Gbl.Degs.EditingDeg.FullName[0] = '\0';
- Gbl.Degs.EditingDeg.FirstYear =
- Gbl.Degs.EditingDeg.LastYear = 0;
Gbl.Degs.EditingDeg.WWW[0] = '\0';
Gbl.Degs.EditingDeg.NumCrss = 0;
Gbl.Degs.EditingDeg.LstCrss = NULL;
diff --git a/swad_preference.c b/swad_preference.c
index 67dc3f15d..f58e66174 100644
--- a/swad_preference.c
+++ b/swad_preference.c
@@ -236,8 +236,6 @@ void Pre_RemoveOldPrefsFromIP (void)
void Pre_PutLinkToChangeLanguage (void)
{
- extern const char *Txt_Log_in;
-
Lay_PutContextualLink (ActEdiPrf,NULL,
"cty64x64.gif",
"Change language","Change language");
diff --git a/swad_text.c b/swad_text.c
index 5a64f28c8..268270d6e 100644
--- a/swad_text.c
+++ b/swad_text.c
@@ -11887,27 +11887,6 @@ const char *Txt_First_name =
"Nome";
#endif
-const char *Txt_First_BR_year = // "First academic year", the opposite to "Last academic year"
-#if L==1
- "Primer año/sem."; // Necessita traduccio
-#elif L==2
- "First year/sem."; // Need Übersetzung
-#elif L==3
- "First year/sem.";
-#elif L==4
- "Primer año/sem.";
-#elif L==5
- "First year/sem."; // Besoin de traduction
-#elif L==6
- "Primer año/sem."; // Okoteve traducción
-#elif L==7
- "Primo anno/sem.";
-#elif L==8
- "Pierwszy rok/sem.";
-#elif L==9
- "First year/sem."; // Necessita de tradução
-#endif
-
const char *Txt_Folder =
#if L==1
"Carpeta";
@@ -15560,27 +15539,6 @@ const char *Txt_Last_clicks_in_real_time =
"Últimos cliques em tempo real";
#endif
-const char *Txt_Last_BR_year = // "Last academic year", the opposite to "First academic year"
-#if L==1
- "Último año/sem."; // Necessita traduccio
-#elif L==2
- "Last year/sem."; // Need Übersetzung
-#elif L==3
- "Last year/sem.";
-#elif L==4
- "Último año/sem.";
-#elif L==5
- "Last year/sem."; // Besoin de traduction
-#elif L==6
- "Último año/sem."; // Okoteve traducción
-#elif L==7
- "Last anno/sem.";
-#elif L==8
- "Ostatni rok/sem.";
-#elif L==9
- "Last year/sem."; // Necessita de tradução
-#endif
-
const char *Txt_LAYOUT_SIDE_COLUMNS[4] =
{
#if L==1
@@ -44603,34 +44561,25 @@ const char *Txt_The_works_of_X_have_been_removed_in_a_total_of_Y_of_his_her_Z_co
" have been removed in a total of %u of her/his %u courses."; // Necessita de tradução
#endif
-const char *Txt_The_year_X_is_not_enabled_on_the_degree_Y = // Warning: it is very important to include two %s in the following sentences
+const char *Txt_The_year_X_is_not_allowed = // Warning: it is very important to include %u in the following sentences
#if L==1
- "El curso %s no está habilitado"
- " en la titulación %s."; // Necessita traduccio
+ "El curso %u no está permitido."; // Necessita traduccio
#elif L==2
- "The year %s is not enabled"
- " on the degree %s."; // Need Übersetzung
+ "The year %u is not enabled."; // Need Übersetzung
#elif L==3
- "The year %s is not enabled"
- " on the degree %s.";
+ "The year %u is not enabled.";
#elif L==4
- "El curso %s no está habilitado"
- " en la titulación %s.";
+ "El curso %u no está permitido.";
#elif L==5
- "The year %s is not enabled"
- " on the degree %s."; // Besoin de traduction
+ "The year %u is not enabled."; // Besoin de traduction
#elif L==6
- "El curso %s no está habilitado"
- " en la titulación %s."; // Okoteve traducción
+ "El curso %u no está permitido."; // Okoteve traducción
#elif L==7
- "L'anno %s non è abilitato"
- " nella laurea %s.";
+ "L'anno %u non è consentito.";
#elif L==8
- "The year %s is not enabled"
- " on the degree %s."; // Potrzebujesz tlumaczenie
+ "The year %u is not allowed."; // Potrzebujesz tlumaczenie
#elif L==9
- "The year %s is not enabled"
- " on the degree %s."; // Necessita de tradução
+ "The year %u is not allowed."; // Necessita de tradução
#endif
const char *Txt_The_year_of_the_course_X_has_changed = // Warning: it is very important to include %s in the following sentences
@@ -44654,27 +44603,6 @@ const char *Txt_The_year_of_the_course_X_has_changed = // Warning: it is very im
"The year of the couse %s has changed."; // Necessita de tradução
#endif
-const char *Txt_The_years_of_the_degree_have_changed =
-#if L==1
- "Los años de la titulación han cambiado."; // Necessita traduccio
-#elif L==2
- "The years of the degree have changed."; // Need Übersetzung
-#elif L==3
- "The years of the degree have changed.";
-#elif L==4
- "Los años de la titulación han cambiado.";
-#elif L==5
- "The years of the degree have changed."; // Besoin de traduction
-#elif L==6
- "Los años de la titulación han cambiado."; // Okoteve traducción
-#elif L==7
- "Gli anni della laurea sono cambiati.";
-#elif L==8
- "The years of the degree have changed."; // Potrzebujesz tlumaczenie
-#elif L==9
- "The years of the degree have changed."; // Necessita de tradução
-#endif
-
const char *Txt_The_ZIP_file_has_been_received_successfully =
#if L==1
"El archivo ZIP se ha recibido correctamente."; // Necessita traduccio