diff --git a/swad_HTML.c b/swad_HTML.c
index ac9a4b3b..a1b15c8d 100644
--- a/swad_HTML.c
+++ b/swad_HTML.c
@@ -1680,7 +1680,8 @@ void HTM_OPTGROUP_End (void)
HTM_OPTGROUP_NestingLevel--;
}
-void HTM_OPTION (HTM_Type_t Type,const void *ValuePtr,bool Selected,bool Disabled,
+void HTM_OPTION (HTM_Type_t Type,const void *ValuePtr,
+ bool Selected,HTM_OptionEnabled_t Disabled,
const char *fmt,...)
{
va_list ap;
@@ -1703,7 +1704,7 @@ void HTM_OPTION (HTM_Type_t Type,const void *ValuePtr,bool Selected,bool Disable
HTM_Txt ("\"");
if (Selected)
HTM_Txt (" selected=\"selected\"");
- if (Disabled)
+ if (Disabled == HTM_OPTION_DISABLED)
HTM_Txt (" disabled=\"disabled\"");
HTM_Txt (">");
diff --git a/swad_HTML.h b/swad_HTML.h
index 686d9e66..1739d865 100644
--- a/swad_HTML.h
+++ b/swad_HTML.h
@@ -52,6 +52,12 @@ typedef enum
HTM_SUBMIT_ON_CLICK,
} HTM_SubmitOnClick_t;
+typedef enum
+ {
+ HTM_OPTION_DISABLED,
+ HTM_OPTION_ENABLED,
+ } HTM_OptionEnabled_t;
+
#define HTM_NUM_HEAD_ALIGN 3
typedef enum
{
@@ -185,7 +191,8 @@ void HTM_SELECT_Begin (HTM_SubmitOnChange_t SubmitOnChange,
void HTM_SELECT_End (void);
void HTM_OPTGROUP_Begin (const char *Label);
void HTM_OPTGROUP_End (void);
-void HTM_OPTION (HTM_Type_t Type,const void *ValuePtr,bool Selected,bool Disabled,
+void HTM_OPTION (HTM_Type_t Type,const void *ValuePtr,
+ bool Selected,HTM_OptionEnabled_t Disabled,
const char *fmt,...);
void HTM_IMG (const char *URL,const char *Icon,const char *Title,
diff --git a/swad_attendance.c b/swad_attendance.c
index 4d1d9d95..796b7cde 100644
--- a/swad_attendance.c
+++ b/swad_attendance.c
@@ -1066,11 +1066,11 @@ void Att_ReqCreatOrEditEvent (void)
The_GetSuffix ());
HTM_OPTION (HTM_Type_STRING,"N",
!Events.Event.CommentTchVisible, // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%s",Txt_Hidden_MALE_PLURAL);
HTM_OPTION (HTM_Type_STRING,"Y",
Events.Event.CommentTchVisible, // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%s",Txt_Visible_MALE_PLURAL);
HTM_SELECT_End ();
HTM_TD_End ();
diff --git a/swad_browser.c b/swad_browser.c
index f99c61ec..7522cd3c 100644
--- a/swad_browser.c
+++ b/swad_browser.c
@@ -7693,11 +7693,11 @@ void Brw_ShowFileMetadata (void)
"id=\"PublicFile\" name=\"PublicFile\" class=\"PUBLIC_FILE\"");
HTM_OPTION (HTM_Type_STRING,"N",
!FileMetadata.IsPublic, // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%s",Txt_Private_available_to_certain_users_identified);
HTM_OPTION (HTM_Type_STRING,"Y",
FileMetadata.IsPublic, // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%s",Txt_Public_open_educational_resource_OER_for_everyone);
HTM_SELECT_End ();
}
@@ -7730,7 +7730,7 @@ void Brw_ShowFileMetadata (void)
LicenseUnsigned = (unsigned) License;
HTM_OPTION (HTM_Type_UNSIGNED,&LicenseUnsigned,
License == FileMetadata.License, // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%s",Txt_LICENSES[License]);
}
HTM_SELECT_End ();
@@ -9756,7 +9756,7 @@ void Brw_AskRemoveOldFiles (void)
Months++)
HTM_OPTION (HTM_Type_UNSIGNED,&Months,
Months == Brw_DEF_MONTHS_TO_REMOVE_OLD_FILES, // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%u",Months);
HTM_SELECT_End ();
HTM_NBSP ();
diff --git a/swad_call_for_exam.c b/swad_call_for_exam.c
index de88f9c2..8127b047 100644
--- a/swad_call_for_exam.c
+++ b/swad_call_for_exam.c
@@ -1055,7 +1055,7 @@ static void Cfe_ShowCallForExam (struct Cfe_CallsForExams *CallsForExams,
Year++)
HTM_OPTION (HTM_Type_UNSIGNED,&Year,
Year == CallsForExams->CallForExam.Year, // Selected
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%s",Txt_YEAR_OF_DEGREE[Year]);
HTM_SELECT_End ();
}
@@ -1140,14 +1140,14 @@ static void Cfe_ShowCallForExam (struct Cfe_CallsForExams *CallsForExams,
The_GetSuffix ());
HTM_OPTION (HTM_Type_STRING,"0",
CallsForExams->CallForExam.StartTime.Hour == 0, // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"-");
for (Hour = 7;
Hour <= 22;
Hour++)
HTM_OPTION (HTM_Type_UNSIGNED,&Hour,
Hour == CallsForExams->CallForExam.StartTime.Hour, // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%02u %s",Hour,Txt_hours_ABBREVIATION);
HTM_SELECT_End ();
@@ -1159,7 +1159,7 @@ static void Cfe_ShowCallForExam (struct Cfe_CallsForExams *CallsForExams,
Minute++)
HTM_OPTION (HTM_Type_UNSIGNED,&Minute,
Minute == CallsForExams->CallForExam.StartTime.Minute, // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%02u ′",Minute);
HTM_SELECT_End ();
}
@@ -1193,7 +1193,7 @@ static void Cfe_ShowCallForExam (struct Cfe_CallsForExams *CallsForExams,
Hour++)
HTM_OPTION (HTM_Type_UNSIGNED,&Hour,
Hour == CallsForExams->CallForExam.Duration.Hour, // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%02u %s",Hour,Txt_hours_ABBREVIATION);
HTM_SELECT_End ();
@@ -1206,7 +1206,7 @@ static void Cfe_ShowCallForExam (struct Cfe_CallsForExams *CallsForExams,
Minute++)
HTM_OPTION (HTM_Type_UNSIGNED,&Minute,
Minute == CallsForExams->CallForExam.Duration.Minute, // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%02u ′",Minute);
HTM_SELECT_End ();
}
diff --git a/swad_center.c b/swad_center.c
index a940e66b..d6ef16ce 100644
--- a/swad_center.c
+++ b/swad_center.c
@@ -705,7 +705,7 @@ void Ctr_WriteSelectorOfCenter (void)
The_GetSuffix ());
HTM_OPTION (HTM_Type_STRING,"",
Gbl.Hierarchy.Ctr.CtrCod < 0, // Selected?
- true, // Disabled
+ HTM_OPTION_DISABLED,
"[%s]",Txt_Center);
if (Gbl.Hierarchy.Ins.InsCod > 0)
@@ -727,7 +727,7 @@ void Ctr_WriteSelectorOfCenter (void)
HTM_OPTION (HTM_Type_LONG,&CtrCod,
Gbl.Hierarchy.Ctr.CtrCod > 0 &&
CtrCod == Gbl.Hierarchy.Ctr.CtrCod, // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%s",row[1]);
}
@@ -820,7 +820,8 @@ static void Ctr_ListCentersForEdition (const struct Plc_Places *Places)
" class=\"PLC_SEL INPUT_%s\"",
The_GetSuffix ());
HTM_OPTION (HTM_Type_STRING,"0",
- Ctr->PlcCod == 0,false,
+ Ctr->PlcCod == 0, // Selected?
+ HTM_OPTION_ENABLED,
"%s",Txt_Another_place);
for (NumPlc = 0;
NumPlc < Places->Num;
@@ -829,7 +830,7 @@ static void Ctr_ListCentersForEdition (const struct Plc_Places *Places)
PlcInLst = &Places->Lst[NumPlc];
HTM_OPTION (HTM_Type_LONG,&PlcInLst->PlcCod,
PlcInLst->PlcCod == Ctr->PlcCod, // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%s",PlcInLst->ShrtName);
}
HTM_SELECT_End ();
@@ -1312,7 +1313,8 @@ static void Ctr_PutFormToCreateCenter (const struct Plc_Places *Places)
"name=\"PlcCod\" class=\"PLC_SEL INPUT_%s\"",
The_GetSuffix ());
HTM_OPTION (HTM_Type_STRING,"0",
- Ctr_EditingCtr->PlcCod == 0,false,
+ Ctr_EditingCtr->PlcCod == 0, // Selected?
+ HTM_OPTION_ENABLED,
"%s",Txt_Another_place);
for (NumPlc = 0;
NumPlc < Places->Num;
@@ -1321,7 +1323,7 @@ static void Ctr_PutFormToCreateCenter (const struct Plc_Places *Places)
PlcInLst = &Places->Lst[NumPlc];
HTM_OPTION (HTM_Type_LONG,&PlcInLst->PlcCod,
PlcInLst->PlcCod == Ctr_EditingCtr->PlcCod, // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%s",PlcInLst->ShrtName);
}
HTM_SELECT_End ();
diff --git a/swad_center_config.c b/swad_center_config.c
index e16d7b7b..15202e5a 100644
--- a/swad_center_config.c
+++ b/swad_center_config.c
@@ -573,7 +573,7 @@ static void CtrCfg_Institution (bool PrintView,bool PutForm)
InsInLst = &Gbl.Hierarchy.Inss.Lst[NumIns];
HTM_OPTION (HTM_Type_LONG,&InsInLst->InsCod,
InsInLst->InsCod == Gbl.Hierarchy.Ins.InsCod, // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%s",InsInLst->ShrtName);
}
HTM_SELECT_End ();
@@ -671,7 +671,8 @@ static void CtrCfg_Place (bool PutForm)
" class=\"INPUT_SHORT_NAME INPUT_%s\"",
The_GetSuffix ());
HTM_OPTION (HTM_Type_STRING,"0",
- Gbl.Hierarchy.Ctr.PlcCod == 0,false,
+ Gbl.Hierarchy.Ctr.PlcCod == 0, // Selected?
+ HTM_OPTION_ENABLED,
"%s",Txt_Another_place);
for (NumPlc = 0;
NumPlc < Places.Num;
@@ -680,7 +681,7 @@ static void CtrCfg_Place (bool PutForm)
PlcInLst = &Places.Lst[NumPlc];
HTM_OPTION (HTM_Type_LONG,&PlcInLst->PlcCod,
PlcInLst->PlcCod == Gbl.Hierarchy.Ctr.PlcCod, // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%s",PlcInLst->ShrtName);
}
HTM_SELECT_End ();
diff --git a/swad_changelog.h b/swad_changelog.h
index 174947f5..cfbed1fa 100644
--- a/swad_changelog.h
+++ b/swad_changelog.h
@@ -629,10 +629,11 @@ TODO: Emilce Barrera Mesa: Podr
TODO: Emilce Barrera Mesa: Mis estudiantes presentan muchas dificultades a la hora de poner la foto porque la plataforma es muy exigente respecto al fondo de la imagen.
*/
-#define Log_PLATFORM_VERSION "SWAD 22.96 (2023-04-12)"
+#define Log_PLATFORM_VERSION "SWAD 22.96.1 (2023-04-14)"
#define CSS_FILE "swad22.95.css"
#define JS_FILE "swad22.49.js"
/*
+ Version 22.96.1: Apr 14, 2023 Code refactoring in selectors. (338991 lines)
Version 22.96: Apr 12, 2023 Changes in configuration of projects.
Code refactoring in selectors. (338977 lines)
4 changes necessary in database:
diff --git a/swad_country.c b/swad_country.c
index 1cb899cd..25e15910 100644
--- a/swad_country.c
+++ b/swad_country.c
@@ -884,7 +884,7 @@ void Cty_WriteSelectorOfCountry (void)
/***** Initial disabled option *****/
HTM_OPTION (HTM_Type_STRING,"",
Gbl.Hierarchy.Cty.CtyCod < 0, // Selected?
- true, // Disabled
+ HTM_OPTION_DISABLED,
"[%s]",Txt_Country);
/***** List countries *****/
@@ -895,7 +895,7 @@ void Cty_WriteSelectorOfCountry (void)
CtyInLst = &Gbl.Hierarchy.Ctys.Lst[NumCty];
HTM_OPTION (HTM_Type_LONG,&CtyInLst->CtyCod,
CtyInLst->CtyCod == Gbl.Hierarchy.Cty.CtyCod, // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%s",CtyInLst->Name[Gbl.Prefs.Language]);
}
diff --git a/swad_course.c b/swad_course.c
index d103500f..717c4c4a 100644
--- a/swad_course.c
+++ b/swad_course.c
@@ -644,7 +644,7 @@ void Crs_WriteSelectorOfCourse (void)
/***** Initial disabled option *****/
HTM_OPTION (HTM_Type_STRING,"",
Gbl.Hierarchy.Crs.CrsCod < 0, // Selected?
- true, // Disabled
+ HTM_OPTION_DISABLED,
"[%s]",Txt_Course);
if (Gbl.Hierarchy.Deg.DegCod > 0)
@@ -666,7 +666,7 @@ void Crs_WriteSelectorOfCourse (void)
HTM_OPTION (HTM_Type_LONG,&CrsCod,
Gbl.Hierarchy.Level == HieLvl_CRS && // Course selected
CrsCod == Gbl.Hierarchy.Crs.CrsCod,
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%s",row[1]); // Short name (row[1])
}
@@ -781,7 +781,7 @@ void Crs_WriteSelectorMyCoursesInBreadcrumb (void)
if (Gbl.Hierarchy.Crs.CrsCod <= 0) // No course selected
HTM_OPTION (HTM_Type_STRING,"-1",
true, // Selected
- true, // Disabled
+ HTM_OPTION_DISABLED,
"%s",Txt_Course);
if (Gbl.Usrs.Me.MyCrss.Num)
@@ -806,7 +806,7 @@ void Crs_WriteSelectorMyCoursesInBreadcrumb (void)
HTM_OPTION (HTM_Type_LONG,&CrsCod,
CrsCod == Gbl.Hierarchy.Crs.CrsCod, // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%s",CrsShortName);
}
@@ -820,7 +820,7 @@ void Crs_WriteSelectorMyCoursesInBreadcrumb (void)
!Gbl.Usrs.Me.IBelongToCurrentCrs) // I do not belong to it
HTM_OPTION (HTM_Type_LONG,&Gbl.Hierarchy.Crs.CrsCod,
true, // Selected
- true, // Disabled
+ HTM_OPTION_DISABLED,
"%s",Gbl.Hierarchy.Crs.ShrtName);
/***** End selector of courses *****/
@@ -1219,7 +1219,7 @@ static void Crs_ListCoursesOfAYearForEdition (unsigned Year)
// to another degree (with other active years)
HTM_OPTION (HTM_Type_UNSIGNED,&YearAux,
YearAux == Crs->Year, // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%s",Txt_YEAR_OF_DEGREE[YearAux]);
HTM_SELECT_End ();
Frm_EndForm ();
@@ -1362,7 +1362,7 @@ static void Crs_PutFormToCreateCourse (void)
Year++)
HTM_OPTION (HTM_Type_UNSIGNED,&Year,
Year == Crs_EditingCrs->Year, // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%s",Txt_YEAR_OF_DEGREE[Year]);
HTM_SELECT_End ();
HTM_TD_End ();
@@ -2555,7 +2555,7 @@ void Crs_AskRemoveOldCrss (void)
i++)
HTM_OPTION (HTM_Type_UNSIGNED,&i,
i == MonthsWithoutAccess, // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%u",i);
HTM_SELECT_End ();
HTM_NBSP ();
diff --git a/swad_course_config.c b/swad_course_config.c
index e2ae7d4d..92641467 100644
--- a/swad_course_config.c
+++ b/swad_course_config.c
@@ -244,7 +244,7 @@ static void CrsCfg_Degree (bool PrintView,bool PutForm)
DegInLst = &Gbl.Hierarchy.Degs.Lst[NumDeg];
HTM_OPTION (HTM_Type_LONG,&DegInLst->DegCod,
DegInLst->DegCod == Gbl.Hierarchy.Deg.DegCod, // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%s",DegInLst->ShrtName);
}
HTM_SELECT_End ();
@@ -332,7 +332,7 @@ static void CrsCfg_Year (bool PutForm)
Year++)
HTM_OPTION (HTM_Type_UNSIGNED,&Year,
Year == Gbl.Hierarchy.Crs.Year, // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%s",Txt_YEAR_OF_DEGREE[Year]);
HTM_SELECT_End ();
Frm_EndForm ();
diff --git a/swad_date.c b/swad_date.c
index 03989abd..b26e506a 100644
--- a/swad_date.c
+++ b/swad_date.c
@@ -768,7 +768,7 @@ void Dat_WriteFormClientLocalDateTimeFromTimeUTC (const char *Id,
Year++)
HTM_OPTION (HTM_Type_UNSIGNED,&Year,
false, // Not selected
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%u",Year);
HTM_SELECT_End ();
HTM_TD_End ();
@@ -785,7 +785,7 @@ void Dat_WriteFormClientLocalDateTimeFromTimeUTC (const char *Id,
Month++)
HTM_OPTION (HTM_Type_UNSIGNED,&Month,
false, // Not selected
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%s",Txt_MONTHS_SMALL[Month - 1]);
HTM_SELECT_End ();
HTM_TD_End ();
@@ -802,7 +802,7 @@ void Dat_WriteFormClientLocalDateTimeFromTimeUTC (const char *Id,
Day++)
HTM_OPTION (HTM_Type_UNSIGNED,&Day,
false, // Not selected
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%u",Day);
HTM_SELECT_End ();
HTM_TD_End ();
@@ -819,7 +819,7 @@ void Dat_WriteFormClientLocalDateTimeFromTimeUTC (const char *Id,
Hour++)
HTM_OPTION (HTM_Type_UNSIGNED,&Hour,
false, // Not selected
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%02u h",Hour);
HTM_SELECT_End ();
HTM_TD_End ();
@@ -836,7 +836,7 @@ void Dat_WriteFormClientLocalDateTimeFromTimeUTC (const char *Id,
Minute += MinutesIInterval[FormSeconds])
HTM_OPTION (HTM_Type_UNSIGNED,&Minute,
false, // Not selected
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%02u ′",Minute);
HTM_SELECT_End ();
HTM_TD_End ();
@@ -855,7 +855,7 @@ void Dat_WriteFormClientLocalDateTimeFromTimeUTC (const char *Id,
Second++)
HTM_OPTION (HTM_Type_UNSIGNED,&Second,
false, // Not selected
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%02u ″",Second);
HTM_SELECT_End ();
HTM_TD_End ();
@@ -1022,14 +1022,14 @@ void Dat_WriteFormDate (unsigned FirstYear,unsigned LastYear,
"");
HTM_OPTION (HTM_Type_STRING,"0",
false, // Not selected
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"-");
for (Year = FirstYear;
Year <= LastYear;
Year++)
HTM_OPTION (HTM_Type_UNSIGNED,&Year,
Year == DateSelected->Year, // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%u",Year);
HTM_SELECT_End ();
HTM_TD_End ();
@@ -1045,14 +1045,14 @@ void Dat_WriteFormDate (unsigned FirstYear,unsigned LastYear,
"");
HTM_OPTION (HTM_Type_STRING,"0",
false, // Not selected
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"-");
for (Month = 1;
Month <= 12;
Month++)
HTM_OPTION (HTM_Type_UNSIGNED,&Month,
Month == DateSelected->Month, // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%s",Txt_MONTHS_SMALL[Month - 1]);
HTM_SELECT_End ();
HTM_TD_End ();
@@ -1070,7 +1070,7 @@ void Dat_WriteFormDate (unsigned FirstYear,unsigned LastYear,
"");
HTM_OPTION (HTM_Type_STRING,"0",
false, // Not selected
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"-");
NumDaysSelectedMonth = (DateSelected->Month == 0) ? 31 :
((DateSelected->Month == 2) ? Dat_GetNumDaysFebruary (DateSelected->Year) :
@@ -1080,7 +1080,7 @@ void Dat_WriteFormDate (unsigned FirstYear,unsigned LastYear,
Day++)
HTM_OPTION (HTM_Type_UNSIGNED,&Day,
Day == DateSelected->Day, // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%u",Day);
HTM_SELECT_End ();
HTM_TD_End ();
diff --git a/swad_degree.c b/swad_degree.c
index da64e8c8..a0708213 100644
--- a/swad_degree.c
+++ b/swad_degree.c
@@ -242,7 +242,7 @@ void Deg_WriteSelectorOfDegree (void)
The_GetSuffix ());
HTM_OPTION (HTM_Type_STRING,"",
Gbl.Hierarchy.Deg.DegCod <= 0, // Selected?
- true, // Disabled
+ HTM_OPTION_DISABLED,
"[%s]",Txt_Degree);
if (Gbl.Hierarchy.Ctr.CtrCod > 0)
@@ -266,7 +266,7 @@ void Deg_WriteSelectorOfDegree (void)
HTM_OPTION (HTM_Type_LONG,&DegCod,
Gbl.Hierarchy.Deg.DegCod > 0 &&
DegCod == Gbl.Hierarchy.Deg.DegCod, // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%s",row[1]);
}
@@ -418,7 +418,7 @@ static void Deg_ListDegreesForEdition (const struct DegTyp_DegTypes *DegTypes)
DegTypInLst = &DegTypes->Lst[NumDegTyp];
HTM_OPTION (HTM_Type_LONG,&DegTypInLst->DegTypCod,
DegTypInLst->DegTypCod == DegInLst->DegTypCod, // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%s",DegTypInLst->DegTypName);
}
HTM_SELECT_End ();
@@ -581,7 +581,7 @@ static void Deg_PutFormToCreateDegree (const struct DegTyp_DegTypes *DegTypes)
DegTypInLst = &DegTypes->Lst[NumDegTyp];
HTM_OPTION (HTM_Type_LONG,&DegTypInLst->DegTypCod,
DegTypInLst->DegTypCod == Deg_EditingDeg->DegTypCod, // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%s",DegTypInLst->DegTypName);
}
HTM_SELECT_End ();
diff --git a/swad_degree_config.c b/swad_degree_config.c
index 7ff5be78..ff85a69f 100644
--- a/swad_degree_config.c
+++ b/swad_degree_config.c
@@ -239,7 +239,7 @@ static void DegCfg_Center (bool PrintView,bool PutForm)
CtrInLst = &Gbl.Hierarchy.Ctrs.Lst[NumCtr];
HTM_OPTION (HTM_Type_LONG,&CtrInLst->CtrCod,
CtrInLst->CtrCod == Gbl.Hierarchy.Ctr.CtrCod, // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%s",CtrInLst->ShrtName);
}
HTM_SELECT_End ();
diff --git a/swad_degree_type.c b/swad_degree_type.c
index bea6c271..e5ddc76e 100644
--- a/swad_degree_type.c
+++ b/swad_degree_type.c
@@ -118,7 +118,7 @@ void DegTyp_WriteSelectorDegreeTypes (long SelectedDegTypCod)
The_GetSuffix ());
HTM_OPTION (HTM_Type_STRING,"-1",
SelectedDegTypCod <= 0, // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%s",Txt_Any_type_of_degree);
for (NumDegTyp = 0;
NumDegTyp < DegTypes.Num;
@@ -127,7 +127,7 @@ void DegTyp_WriteSelectorDegreeTypes (long SelectedDegTypCod)
DegTypInLst = &DegTypes.Lst[NumDegTyp];
HTM_OPTION (HTM_Type_LONG,&DegTypInLst->DegTypCod,
DegTypInLst->DegTypCod == SelectedDegTypCod, // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%s",DegTypInLst->DegTypName);
}
HTM_SELECT_End ();
diff --git a/swad_department.c b/swad_department.c
index 61435cbd..cd7a18c2 100644
--- a/swad_department.c
+++ b/swad_department.c
@@ -490,7 +490,7 @@ static void Dpt_ListDepartmentsForEdition (const struct Dpt_Departments *Departm
The_GetSuffix ());
HTM_OPTION (HTM_Type_STRING,"0",
DptInLst->InsCod == 0, // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%s",Txt_Another_institution);
for (NumIns = 0;
NumIns < Gbl.Hierarchy.Inss.Num;
@@ -499,7 +499,7 @@ static void Dpt_ListDepartmentsForEdition (const struct Dpt_Departments *Departm
InsInLst = &Gbl.Hierarchy.Inss.Lst[NumIns];
HTM_OPTION (HTM_Type_LONG,&InsInLst->InsCod,
InsInLst->InsCod == DptInLst->InsCod, // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%s",InsInLst->ShrtName);
}
HTM_SELECT_End ();
@@ -824,7 +824,7 @@ static void Dpt_PutFormToCreateDepartment (void)
The_GetSuffix ());
HTM_OPTION (HTM_Type_STRING,"0",
Dpt_EditingDpt->InsCod == 0, // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%s",Txt_Another_institution);
for (NumIns = 0;
NumIns < Gbl.Hierarchy.Inss.Num;
@@ -833,7 +833,7 @@ static void Dpt_PutFormToCreateDepartment (void)
InsInLst = &Gbl.Hierarchy.Inss.Lst[NumIns];
HTM_OPTION (HTM_Type_LONG,&InsInLst->InsCod,
InsInLst->InsCod == Dpt_EditingDpt->InsCod, // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%s",InsInLst->ShrtName);
}
HTM_SELECT_End ();
@@ -1029,14 +1029,15 @@ void Dpt_WriteSelectorDepartment (long InsCod,long DptCod,
HTM_OPTION (HTM_Type_STRING,"-1",
DptCod < 0, // Selected?
- !NoDptSelectable, // Disabled?
+ NoDptSelectable ? HTM_OPTION_ENABLED :
+ HTM_OPTION_DISABLED,
"%s",TextWhenNoDptSelected);
}
/* Another department selected (different to all departments listed) */
HTM_OPTION (HTM_Type_STRING,"0",
DptCod == 0, // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%s",Txt_Another_department);
}
@@ -1048,7 +1049,7 @@ void Dpt_WriteSelectorDepartment (long InsCod,long DptCod,
DptInLst = &Departments.Lst[NumDpt];
HTM_OPTION (HTM_Type_LONG,&DptInLst->DptCod,
DptInLst->DptCod == DptCod, // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%s",DptInLst->FullName);
}
diff --git a/swad_enrolment.c b/swad_enrolment.c
index e6e8a254..a7aec4b0 100644
--- a/swad_enrolment.c
+++ b/swad_enrolment.c
@@ -681,7 +681,7 @@ void Enr_AskRemoveOldUsrs (void)
Months++)
HTM_OPTION (HTM_Type_UNSIGNED,&Months,
Months == Usr_DEF_MONTHS_WITHOUT_ACCESS_TO_REMOVE_OLD_USRS, // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%u",Months);
HTM_SELECT_End ();
HTM_NBSP ();
diff --git a/swad_exam_print.c b/swad_exam_print.c
index 90a342b2..1af2483b 100644
--- a/swad_exam_print.c
+++ b/swad_exam_print.c
@@ -817,15 +817,15 @@ static void ExaPrn_WriteTF_AnsToFill (const struct ExaPrn_Print *Print,
HTM_Txt (" />");
HTM_OPTION (HTM_Type_STRING,"" ,
Print->PrintedQuestions[QstInd].StrAnswers[0] == '\0',// Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
" ");
HTM_OPTION (HTM_Type_STRING,"T",
Print->PrintedQuestions[QstInd].StrAnswers[0] == 'T', // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%s",Txt_TF_QST[0]);
HTM_OPTION (HTM_Type_STRING,"F",
Print->PrintedQuestions[QstInd].StrAnswers[0] == 'F', // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%s",Txt_TF_QST[1]);
HTM_Txt ("");
}
diff --git a/swad_figure.c b/swad_figure.c
index 6e082cc4..2b9c6a9f 100644
--- a/swad_figure.c
+++ b/swad_figure.c
@@ -125,7 +125,7 @@ static void Fig_ReqShowFigure (Fig_FigureType_t SelectedFigureType)
FigureTypeUnsigned = (unsigned) FigType;
HTM_OPTION (HTM_Type_UNSIGNED,&FigureTypeUnsigned,
FigType == SelectedFigureType, // Selected?
- false, // Not disabled?
+ HTM_OPTION_ENABLED,
"%s",Txt_FIGURE_TYPES[FigType]);
}
HTM_SELECT_End ();
diff --git a/swad_group.c b/swad_group.c
index 5d89273e..9c5f2377 100644
--- a/swad_group.c
+++ b/swad_group.c
@@ -1265,11 +1265,11 @@ static void Grp_ListGroupTypesForEdition (void)
The_GetSuffix ());
HTM_OPTION (HTM_Type_STRING,"N",
!Gbl.Crs.Grps.GrpTypes.LstGrpTypes[NumGrpTyp].MandatoryEnrolment, // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%s",Txt_It_is_optional_to_choose_a_group);
HTM_OPTION (HTM_Type_STRING,"Y",
Gbl.Crs.Grps.GrpTypes.LstGrpTypes[NumGrpTyp].MandatoryEnrolment, // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%s",Txt_It_is_mandatory_to_choose_a_group);
HTM_SELECT_End ();
Frm_EndForm ();
@@ -1285,11 +1285,11 @@ static void Grp_ListGroupTypesForEdition (void)
The_GetSuffix ());
HTM_OPTION (HTM_Type_STRING,"N",
!Gbl.Crs.Grps.GrpTypes.LstGrpTypes[NumGrpTyp].MultipleEnrolment, // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%s",Txt_A_student_can_only_belong_to_one_group);
HTM_OPTION (HTM_Type_STRING,"Y",
Gbl.Crs.Grps.GrpTypes.LstGrpTypes[NumGrpTyp].MultipleEnrolment, // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%s",Txt_A_student_can_belong_to_several_groups);
HTM_SELECT_End ();
Frm_EndForm ();
@@ -1489,7 +1489,7 @@ static void Grp_ListGroupsForEdition (const struct Roo_Rooms *Rooms)
GrpTyp2InLst = &Gbl.Crs.Grps.GrpTypes.LstGrpTypes[NumGrpTyp2];
HTM_OPTION (HTM_Type_LONG,&GrpTyp2InLst->GrpTypCod,
GrpTyp2InLst->GrpTypCod == GrpTyp1InLst->GrpTypCod, // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%s",GrpTyp2InLst->GrpTypName);
}
@@ -1522,12 +1522,13 @@ static void Grp_ListGroupsForEdition (const struct Roo_Rooms *Rooms)
/* Option for no assigned room */
HTM_OPTION (HTM_Type_STRING,"-1",
Grp->Room.RooCod < 0, // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%s",Txt_No_assigned_room);
/* Option for another room */
HTM_OPTION (HTM_Type_STRING,"0",
- Grp->Room.RooCod == 0,false,
+ Grp->Room.RooCod == 0, // Selected?
+ HTM_OPTION_ENABLED,
"%s",Txt_Another_room);
/* Options for rooms */
@@ -1538,7 +1539,7 @@ static void Grp_ListGroupsForEdition (const struct Roo_Rooms *Rooms)
RooInLst = &Rooms->Lst[NumRoo];
HTM_OPTION (HTM_Type_LONG,&RooInLst->RooCod,
RooInLst->RooCod == Grp->Room.RooCod, // Selected
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%s",RooInLst->ShrtName);
}
@@ -2449,11 +2450,11 @@ static void Grp_PutFormToCreateGroupType (void)
The_GetSuffix ());
HTM_OPTION (HTM_Type_STRING,"N",
!Gbl.Crs.Grps.GrpTyp.MandatoryEnrolment, // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%s",Txt_It_is_optional_to_choose_a_group);
HTM_OPTION (HTM_Type_STRING,"Y",
Gbl.Crs.Grps.GrpTyp.MandatoryEnrolment, // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%s",Txt_It_is_mandatory_to_choose_a_group);
HTM_SELECT_End ();
HTM_TD_End ();
@@ -2466,11 +2467,11 @@ static void Grp_PutFormToCreateGroupType (void)
The_GetSuffix ());
HTM_OPTION (HTM_Type_STRING,"N",
!Gbl.Crs.Grps.GrpTyp.MultipleEnrolment, // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%s",Txt_A_student_can_only_belong_to_one_group);
HTM_OPTION (HTM_Type_STRING,"Y",
Gbl.Crs.Grps.GrpTyp.MultipleEnrolment, // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%s",Txt_A_student_can_belong_to_several_groups);
HTM_SELECT_End ();
HTM_TD_End ();
@@ -2587,7 +2588,7 @@ static void Grp_PutFormToCreateGroup (const struct Roo_Rooms *Rooms)
GrpTypInLst = &Gbl.Crs.Grps.GrpTypes.LstGrpTypes[NumGrpTyp];
HTM_OPTION (HTM_Type_LONG,&GrpTypInLst->GrpTypCod,
GrpTypInLst->GrpTypCod == Gbl.Crs.Grps.GrpTyp.GrpTypCod, // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%s",GrpTypInLst->GrpTypName);
}
@@ -2615,13 +2616,13 @@ static void Grp_PutFormToCreateGroup (const struct Roo_Rooms *Rooms)
/* Option for no assigned room */
HTM_OPTION (HTM_Type_STRING,"-1",
Gbl.Crs.Grps.RooCod < 0, // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%s",Txt_No_assigned_room);
/* Option for another room */
HTM_OPTION (HTM_Type_STRING,"0",
Gbl.Crs.Grps.RooCod == 0, // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%s",Txt_Another_room);
/* Options for rooms */
@@ -2632,7 +2633,7 @@ static void Grp_PutFormToCreateGroup (const struct Roo_Rooms *Rooms)
RooInLst = &Rooms->Lst[NumRoo];
HTM_OPTION (HTM_Type_LONG,&RooInLst->RooCod,
RooInLst->RooCod == Gbl.Crs.Grps.RooCod, // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%s",RooInLst->ShrtName);
}
diff --git a/swad_hierarchy.c b/swad_hierarchy.c
index ba26e817..5a96fd5f 100644
--- a/swad_hierarchy.c
+++ b/swad_hierarchy.c
@@ -812,13 +812,13 @@ void Hie_WriteStatusCellEditable (bool ICanEdit,Hie_Status_t Status,
StatusUnsigned = (unsigned) Hie_GetStatusBitsFromStatusTxt (Hie_STATUS_PENDING);
HTM_OPTION (HTM_Type_UNSIGNED,&StatusUnsigned,
true, // Selected
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%s",Txt[Hie_STATUS_PENDING]);
StatusUnsigned = (unsigned) Hie_GetStatusBitsFromStatusTxt (Hie_STATUS_ACTIVE);
HTM_OPTION (HTM_Type_UNSIGNED,&StatusUnsigned,
false, // Not selected
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%s",Txt[Hie_STATUS_ACTIVE]);
HTM_SELECT_End ();
diff --git a/swad_holiday.c b/swad_holiday.c
index a2a73259..03041c26 100644
--- a/swad_holiday.c
+++ b/swad_holiday.c
@@ -525,7 +525,7 @@ static void Hld_ListHolidaysForEdition (const struct Hld_Holidays *Holidays,
The_GetSuffix ());
HTM_OPTION (HTM_Type_STRING,"-1",
HldInLst->PlcCod <= 0, // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%s",Txt_All_places);
for (NumPlc = 0;
NumPlc < Places->Num;
@@ -534,7 +534,7 @@ static void Hld_ListHolidaysForEdition (const struct Hld_Holidays *Holidays,
PlcInLst = &Places->Lst[NumPlc];
HTM_OPTION (HTM_Type_LONG,&PlcInLst->PlcCod,
PlcInLst->PlcCod == HldInLst->PlcCod, // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%s",PlcInLst->ShrtName);
}
HTM_SELECT_End ();
@@ -556,7 +556,7 @@ static void Hld_ListHolidaysForEdition (const struct Hld_Holidays *Holidays,
HolidayTypeUnsigned = (unsigned) HolidayType;
HTM_OPTION (HTM_Type_UNSIGNED,&HolidayTypeUnsigned,
HolidayType == HldInLst->HldTyp, // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%s",Txt_HOLIDAY_TYPES[HolidayType]);
}
HTM_SELECT_End ();
@@ -903,7 +903,7 @@ static void Hld_PutFormToCreateHoliday (const struct Plc_Places *Places)
The_GetSuffix ());
HTM_OPTION (HTM_Type_STRING,"-1",
Hld_EditingHld->PlcCod <= 0, // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%s",Txt_All_places);
for (NumPlc = 0;
NumPlc < Places->Num;
@@ -912,7 +912,7 @@ static void Hld_PutFormToCreateHoliday (const struct Plc_Places *Places)
PlcInLst = &Places->Lst[NumPlc];
HTM_OPTION (HTM_Type_LONG,&PlcInLst->PlcCod,
PlcInLst->PlcCod == Hld_EditingHld->PlcCod, // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%s",PlcInLst->ShrtName);
}
HTM_SELECT_End ();
@@ -931,7 +931,7 @@ static void Hld_PutFormToCreateHoliday (const struct Plc_Places *Places)
HolidayTypeUnsigned = (unsigned) HolidayType;
HTM_OPTION (HTM_Type_UNSIGNED,&HolidayTypeUnsigned,
HolidayType == Hld_EditingHld->HldTyp, // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%s",Txt_HOLIDAY_TYPES[HolidayType]);
}
HTM_SELECT_End ();
diff --git a/swad_institution.c b/swad_institution.c
index 683ed980..c5daf628 100644
--- a/swad_institution.c
+++ b/swad_institution.c
@@ -879,7 +879,7 @@ void Ins_WriteSelectorOfInstitution (void)
HTM_OPTION (HTM_Type_STRING,"",
Gbl.Hierarchy.Ins.InsCod < 0, // Selected?
- true, // Disabled
+ HTM_OPTION_DISABLED,
"[%s]",Txt_Institution);
if (Gbl.Hierarchy.Cty.CtyCod > 0)
@@ -903,7 +903,7 @@ void Ins_WriteSelectorOfInstitution (void)
HTM_OPTION (HTM_Type_LONG,&InsCod,
Gbl.Hierarchy.Ins.InsCod > 0 &&
InsCod == Gbl.Hierarchy.Ins.InsCod, // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%s",row[1]);
}
diff --git a/swad_institution_config.c b/swad_institution_config.c
index 74b13245..fc59d29d 100644
--- a/swad_institution_config.c
+++ b/swad_institution_config.c
@@ -339,7 +339,7 @@ static void InsCfg_Country (bool PrintView,bool PutForm)
CtyInLst = &Gbl.Hierarchy.Ctys.Lst[NumCty];
HTM_OPTION (HTM_Type_LONG,&CtyInLst->CtyCod,
CtyInLst->CtyCod == Gbl.Hierarchy.Cty.CtyCod, // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%s",CtyInLst->Name[Gbl.Prefs.Language]);
}
HTM_SELECT_End ();
diff --git a/swad_language.c b/swad_language.c
index f8fdbde1..e48fe02c 100644
--- a/swad_language.c
+++ b/swad_language.c
@@ -138,7 +138,7 @@ void Lan_PutSelectorToSelectLanguage (void)
LanUnsigned = (unsigned) Lan;
HTM_OPTION (HTM_Type_UNSIGNED,&LanUnsigned,
Lan == Gbl.Prefs.Language, // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%s",Txt_STR_LANG_NAME[Lan]);
}
HTM_SELECT_End ();
diff --git a/swad_message.c b/swad_message.c
index 741b302b..9303f733 100644
--- a/swad_message.c
+++ b/swad_message.c
@@ -1823,7 +1823,7 @@ static void Msg_ShowFormSelectCourseSentOrRecMsgs (const struct Msg_Messages *Me
/* Write a first option to select any course */
HTM_OPTION (HTM_Type_STRING,"",
Messages->FilterCrsCod < 0, // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%s",Txt_any_course);
/* Write an option for each origin course */
@@ -1837,7 +1837,7 @@ static void Msg_ShowFormSelectCourseSentOrRecMsgs (const struct Msg_Messages *Me
if ((CrsCod = Str_ConvertStrCodToLongCod (row[0])) > 0)
HTM_OPTION (HTM_Type_LONG,&CrsCod,
CrsCod == Messages->FilterCrsCod, // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%s",row[1]); // Course short name
}
diff --git a/swad_photo.c b/swad_photo.c
index c22ab2ab..eb166368 100644
--- a/swad_photo.c
+++ b/swad_photo.c
@@ -1803,7 +1803,7 @@ static void Pho_PutSelectorForTypeOfAvg (const struct Pho_DegPhotos *DegPhotos)
TypeOfAvgUnsigned = (unsigned) TypeOfAvg;
HTM_OPTION (HTM_Type_UNSIGNED,&TypeOfAvgUnsigned,
TypeOfAvg == DegPhotos->TypeOfAverage, // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%s",Txt_AVERAGE_PHOTO_TYPES[TypeOfAvg]);
}
HTM_SELECT_End ();
@@ -1869,7 +1869,7 @@ static void Pho_PutSelectorForHowComputePhotoSize (const struct Pho_DegPhotos *D
PhoSiUnsigned = (unsigned) PhoSi;
HTM_OPTION (HTM_Type_UNSIGNED,&PhoSiUnsigned,
PhoSi == DegPhotos->HowComputePhotoSize, // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%s",Txt_STAT_DEGREE_PHOTO_SIZE[PhoSi]);
}
HTM_SELECT_End ();
@@ -1934,7 +1934,7 @@ static void Pho_PutSelectorForHowOrderDegrees (const struct Pho_DegPhotos *DegPh
OrderUnsigned = (unsigned) Order;
HTM_OPTION (HTM_Type_UNSIGNED,&OrderUnsigned,
Order == DegPhotos->HowOrderDegrees, // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%s",Txt_STAT_DEGREE_PHOTO_ORDER[Order]);
}
HTM_SELECT_End ();
@@ -2045,11 +2045,12 @@ static void Pho_PutLinkToCalculateDegreeStats (const struct Pho_DegPhotos *DegPh
Selected = (Degs.Lst[NumDeg].DegCod == Deg.DegCod);
if (Selected)
- Disabled = false;
+ Disabled = HTM_OPTION_ENABLED;
else
// Too recently computed ?
Disabled = Pho_GetTimeAvgPhotoWasComputed (Degs.Lst[NumDeg].DegCod) >=
- Dat_GetStartExecutionTimeUTC () - Cfg_MIN_TIME_TO_RECOMPUTE_AVG_PHOTO;
+ Dat_GetStartExecutionTimeUTC () - Cfg_MIN_TIME_TO_RECOMPUTE_AVG_PHOTO ? HTM_OPTION_DISABLED :
+ HTM_OPTION_ENABLED;
HTM_OPTION (HTM_Type_LONG,&Degs.Lst[NumDeg].DegCod,
Selected,
Disabled,
diff --git a/swad_project.c b/swad_project.c
index 2d069886..063596f6 100644
--- a/swad_project.c
+++ b/swad_project.c
@@ -1853,7 +1853,7 @@ static void Prj_PutSelectorReviewStatus (struct Prj_Projects *Projects)
ReviewStatusUnsigned = (unsigned) ReviewStatus;
HTM_OPTION (HTM_Type_UNSIGNED,&ReviewStatusUnsigned,
ReviewStatus == Projects->Prj.Review.Status, // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%s",Txt_PROJECT_REVIEW_SINGUL[ReviewStatus]);
}
HTM_SELECT_End ();
@@ -3842,11 +3842,11 @@ static void Prj_PutFormProject (struct Prj_Projects *Projects,
The_GetSuffix ());
HTM_OPTION (HTM_Type_STRING,"Y",
Projects->Prj.Assigned == Prj_ASSIGNED, // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%s",Txt_Yes);
HTM_OPTION (HTM_Type_STRING,"N",
Projects->Prj.Assigned == Prj_NONASSIG, // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%s",Txt_No);
HTM_SELECT_End ();
HTM_TD_End ();
@@ -3888,7 +3888,7 @@ static void Prj_PutFormProject (struct Prj_Projects *Projects,
ProposalUnsigned = (unsigned) Proposal;
HTM_OPTION (HTM_Type_UNSIGNED,&ProposalUnsigned,
Projects->Prj.Proposal == Proposal, // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%s",Txt_PROJECT_STATUS[Proposal]);
}
HTM_SELECT_End ();
diff --git a/swad_project_config.c b/swad_project_config.c
index 1e8eb079..67a1c77d 100644
--- a/swad_project_config.c
+++ b/swad_project_config.c
@@ -214,7 +214,7 @@ static void PrjCfg_ShowFormRubric (const struct PrjCfg_Config *Config,
/* First option to indicate that no rubric is selected */
HTM_OPTION (HTM_Type_STRING,"-1",
RubCodInConfig <= 0, // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"[%s]",Txt_no_rubric);
/* One option for each rubric in this course */
@@ -225,7 +225,7 @@ static void PrjCfg_ShowFormRubric (const struct PrjCfg_Config *Config,
Rubric = &Rubrics->Lst[NumRub];
HTM_OPTION (HTM_Type_LONG,&Rubric->RubCod,
Rubric->RubCod == RubCodInConfig, // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%s",Rubric->Title);
}
diff --git a/swad_question.c b/swad_question.c
index 8a999b47..b0eefa6a 100644
--- a/swad_question.c
+++ b/swad_question.c
@@ -1929,7 +1929,7 @@ void Qst_PutFormEditOneQst (struct Qst_Question *Question)
free (FuncOnChange);
HTM_OPTION (HTM_Type_STRING,"",
false, // Not selected
- false, // Not disabled
+ HTM_OPTION_ENABLED,
" ");
mysql_data_seek (mysql_res,0);
TagFound = false;
@@ -1952,18 +1952,18 @@ void Qst_PutFormEditOneQst (struct Qst_Question *Question)
}
HTM_OPTION (HTM_Type_STRING,row[1],
IsThisTag, // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%s",row[1]);
}
/* If it's a new tag received from the form */
if (!TagFound && Question->Tags.Txt[IndTag][0])
HTM_OPTION (HTM_Type_STRING,Question->Tags.Txt[IndTag],
true, // Selected
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%s",Question->Tags.Txt[IndTag]);
HTM_OPTION (HTM_Type_STRING,"",
false, // Selected
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"[%s]",Txt_new_tag);
HTM_SELECT_End ();
HTM_TD_End ();
diff --git a/swad_record.c b/swad_record.c
index 423a9c0d..857b08dd 100644
--- a/swad_record.c
+++ b/swad_record.c
@@ -329,7 +329,7 @@ void Rec_ListFieldsRecordsForEdition (void)
VisUnsigned = (unsigned) Vis;
HTM_OPTION (HTM_Type_UNSIGNED,&VisUnsigned,
Vis == FldInLst->Visibility, // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%s",Txt_RECORD_FIELD_VISIBILITY_MENU[Vis]);
}
HTM_SELECT_End ();
@@ -404,7 +404,7 @@ void Rec_ShowFormCreateRecordField (void)
VisUnsigned = (unsigned) Vis;
HTM_OPTION (HTM_Type_UNSIGNED,&VisUnsigned,
Vis == Gbl.Crs.Records.Field.Visibility, // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%s",Txt_RECORD_FIELD_VISIBILITY_MENU[Vis]);
}
HTM_SELECT_End ();
@@ -1417,7 +1417,7 @@ static void Rec_ShowLinkToPrintPreviewOfRecords (void)
i++)
HTM_OPTION (HTM_Type_UNSIGNED,&i,
i == Gbl.Usrs.Listing.RecsPerPag, // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%u",i);
HTM_SELECT_End ();
HTM_TxtF (" %s)",Txt_record_cards_per_page);
@@ -2814,7 +2814,7 @@ static void Rec_ShowRole (struct Usr_Data *UsrDat,
RoleUnsigned = (unsigned) Role;
HTM_OPTION (HTM_Type_UNSIGNED,&RoleUnsigned,
Role == DefaultRoleInForm, // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%s",Txt_ROLES_SINGUL_Abc[Role][UsrDat->Sex]);
}
HTM_SELECT_End ();
@@ -2881,7 +2881,7 @@ static void Rec_ShowRole (struct Usr_Data *UsrDat,
RoleUnsigned = (unsigned) Gbl.Usrs.Me.Role.Logged;
HTM_OPTION (HTM_Type_UNSIGNED,&RoleUnsigned,
true, // Selected
- true, // Disabled
+ HTM_OPTION_DISABLED,
"%s",Txt_ROLES_SINGUL_Abc[Gbl.Usrs.Me.Role.Logged][UsrDat->Sex]);
break;
case Rol_TCH:
@@ -2896,7 +2896,7 @@ static void Rec_ShowRole (struct Usr_Data *UsrDat,
RoleUnsigned = (unsigned) Role;
HTM_OPTION (HTM_Type_UNSIGNED,&RoleUnsigned,
Role == DefaultRoleInForm, // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%s",Txt_ROLES_SINGUL_Abc[Role][UsrDat->Sex]);
}
break;
@@ -2921,7 +2921,7 @@ static void Rec_ShowRole (struct Usr_Data *UsrDat,
RoleUnsigned = (unsigned) DefaultRoleInForm;
HTM_OPTION (HTM_Type_UNSIGNED,&RoleUnsigned,
true, // Selected
- true, // Disabled
+ HTM_OPTION_DISABLED,
"%s",Txt_ROLES_SINGUL_Abc[DefaultRoleInForm][UsrDat->Sex]);
HTM_SELECT_End ();
}
@@ -2964,7 +2964,7 @@ static void Rec_ShowRole (struct Usr_Data *UsrDat,
RoleUnsigned = (unsigned) Role;
HTM_OPTION (HTM_Type_UNSIGNED,&RoleUnsigned,
Role == DefaultRoleInForm, // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%s",Txt_ROLES_SINGUL_Abc[Role][Usr_SEX_UNKNOWN]);
}
HTM_SELECT_End ();
@@ -2984,7 +2984,7 @@ static void Rec_ShowRole (struct Usr_Data *UsrDat,
RoleUnsigned = (unsigned) Rol_GST;
HTM_OPTION (HTM_Type_UNSIGNED,&RoleUnsigned,
true, // Selected
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%s",Txt_ROLES_SINGUL_Abc[Rol_GST][Usr_SEX_UNKNOWN]);
HTM_SELECT_End ();
break;
@@ -3200,11 +3200,11 @@ static void Rec_ShowCountry (struct Usr_Data *UsrDat,bool PutForm)
The_GetSuffix ());
HTM_OPTION (HTM_Type_STRING,"",
false, // Not selected
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%s",Txt_Country);
HTM_OPTION (HTM_Type_STRING,"0",
UsrDat->CtyCod == 0, // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%s",Txt_Another_country);
for (NumCty = 0;
NumCty < Gbl.Hierarchy.Ctys.Num;
@@ -3213,7 +3213,7 @@ static void Rec_ShowCountry (struct Usr_Data *UsrDat,bool PutForm)
CtyInLst = &Gbl.Hierarchy.Ctys.Lst[NumCty];
HTM_OPTION (HTM_Type_LONG,&CtyInLst->CtyCod,
CtyInLst->CtyCod == UsrDat->CtyCod, // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%s",CtyInLst->Name[Gbl.Prefs.Language]);
}
HTM_SELECT_End ();
@@ -3833,7 +3833,7 @@ static void Rec_ShowFormMyInsCtrDpt (bool IAmATeacher)
The_GetSuffix ());
HTM_OPTION (HTM_Type_STRING,"-1",
Gbl.Usrs.Me.UsrDat.InsCtyCod <= 0, // Selected?
- true, // Disabled
+ HTM_OPTION_DISABLED,
NULL);
for (NumCty = 0;
NumCty < Gbl.Hierarchy.Ctys.Num;
@@ -3842,7 +3842,7 @@ static void Rec_ShowFormMyInsCtrDpt (bool IAmATeacher)
CtyInLst = &Gbl.Hierarchy.Ctys.Lst[NumCty];
HTM_OPTION (HTM_Type_LONG,&CtyInLst->CtyCod,
CtyInLst->CtyCod == Gbl.Usrs.Me.UsrDat.InsCtyCod, // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%s",CtyInLst->Name[Gbl.Prefs.Language]);
}
HTM_SELECT_End ();
@@ -3877,11 +3877,11 @@ static void Rec_ShowFormMyInsCtrDpt (bool IAmATeacher)
The_GetSuffix ());
HTM_OPTION (HTM_Type_STRING,"-1",
Gbl.Usrs.Me.UsrDat.InsCod < 0, // Selected?
- true, // Disabled
+ HTM_OPTION_DISABLED,
NULL);
HTM_OPTION (HTM_Type_STRING,"0",
Gbl.Usrs.Me.UsrDat.InsCod == 0, // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%s",Txt_Another_institution);
for (NumIns = 0;
NumIns < Gbl.Hierarchy.Inss.Num;
@@ -3890,7 +3890,7 @@ static void Rec_ShowFormMyInsCtrDpt (bool IAmATeacher)
InsInLst = &Gbl.Hierarchy.Inss.Lst[NumIns];
HTM_OPTION (HTM_Type_LONG,&InsInLst->InsCod,
InsInLst->InsCod == Gbl.Usrs.Me.UsrDat.InsCod, // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%s",InsInLst->FullName);
}
HTM_SELECT_End ();
@@ -3926,11 +3926,11 @@ static void Rec_ShowFormMyInsCtrDpt (bool IAmATeacher)
The_GetSuffix ());
HTM_OPTION (HTM_Type_STRING,"-1",
Gbl.Usrs.Me.UsrDat.Tch.CtrCod < 0, // Selected?
- true, // Disabled
+ HTM_OPTION_DISABLED,
NULL);
HTM_OPTION (HTM_Type_STRING,"0",
Gbl.Usrs.Me.UsrDat.Tch.CtrCod == 0, // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
Txt_Another_center);
for (NumCtr = 0;
NumCtr < Gbl.Hierarchy.Ctrs.Num;
@@ -3939,7 +3939,7 @@ static void Rec_ShowFormMyInsCtrDpt (bool IAmATeacher)
CtrInLst = &Gbl.Hierarchy.Ctrs.Lst[NumCtr];
HTM_OPTION (HTM_Type_LONG,&CtrInLst->CtrCod,
CtrInLst->CtrCod == Gbl.Usrs.Me.UsrDat.Tch.CtrCod, // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
CtrInLst->FullName);
}
HTM_SELECT_End ();
diff --git a/swad_role.c b/swad_role.c
index 99e43c9f..4e8a0f89 100644
--- a/swad_role.c
+++ b/swad_role.c
@@ -493,7 +493,7 @@ void Rol_PutFormToChangeMyRole (const char *ClassSelect)
RoleUnsigned = (unsigned) Role;
HTM_OPTION (HTM_Type_UNSIGNED,&RoleUnsigned,
Role == Gbl.Usrs.Me.Role.Logged, // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%s",Txt_ROLES_SINGUL_Abc[Role][Gbl.Usrs.Me.UsrDat.Sex]);
}
HTM_SELECT_End ();
diff --git a/swad_room.c b/swad_room.c
index 891a1117..9717a3a4 100644
--- a/swad_room.c
+++ b/swad_room.c
@@ -791,13 +791,13 @@ static void Roo_PutSelectorBuilding (long BldCod,
/***** Option for no assigned building *****/
HTM_OPTION (HTM_Type_STRING,"-1",
BldCod < 0, // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%s",Txt_No_assigned_building);
/***** Option for another room *****/
HTM_OPTION (HTM_Type_STRING,"0",
BldCod == 0, // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%s",Txt_Another_building);
/***** Options for buildings *****/
@@ -808,7 +808,7 @@ static void Roo_PutSelectorBuilding (long BldCod,
BldInLst = &Buildings->Lst[NumBld];
HTM_OPTION (HTM_Type_LONG,&BldInLst->BldCod,
BldCod == BldInLst->BldCod, // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%s",BldInLst->ShrtName);
}
@@ -837,7 +837,7 @@ static void Roo_PutSelectorType (Roo_RoomType_t RoomType,
Type++)
HTM_OPTION (HTM_Type_UNSIGNED,&Type,
Type == RoomType, // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%s",Txt_ROOM_TYPES[Type]);
/***** End selector *****/
diff --git a/swad_scope.c b/swad_scope.c
index 0d6c2bde..fb96d055 100644
--- a/swad_scope.c
+++ b/swad_scope.c
@@ -106,7 +106,7 @@ void Sco_PutSelectorScope (const char *ParName,HTM_SubmitOnChange_t SubmitOnChan
case HieLvl_SYS:
HTM_OPTION (HTM_Type_UNSIGNED,&ScopeUnsigned,
Gbl.Scope.Current == Scope, // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%s: %s",
Txt_System,
Cfg_PLATFORM_SHORT_NAME);
@@ -114,7 +114,7 @@ void Sco_PutSelectorScope (const char *ParName,HTM_SubmitOnChange_t SubmitOnChan
case HieLvl_CTY:
HTM_OPTION (HTM_Type_UNSIGNED,&ScopeUnsigned,
Gbl.Scope.Current == Scope, // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%s: %s",
Txt_Country,
Gbl.Hierarchy.Cty.Name[Gbl.Prefs.Language]);
@@ -122,7 +122,7 @@ void Sco_PutSelectorScope (const char *ParName,HTM_SubmitOnChange_t SubmitOnChan
case HieLvl_INS:
HTM_OPTION (HTM_Type_UNSIGNED,&ScopeUnsigned,
Gbl.Scope.Current == Scope, // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%s: %s",
Txt_Institution,
Gbl.Hierarchy.Ins.ShrtName);
@@ -130,7 +130,7 @@ void Sco_PutSelectorScope (const char *ParName,HTM_SubmitOnChange_t SubmitOnChan
case HieLvl_CTR:
HTM_OPTION (HTM_Type_UNSIGNED,&ScopeUnsigned,
Gbl.Scope.Current == Scope, // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%s: %s",
Txt_Center,
Gbl.Hierarchy.Ctr.ShrtName);
@@ -138,7 +138,7 @@ void Sco_PutSelectorScope (const char *ParName,HTM_SubmitOnChange_t SubmitOnChan
case HieLvl_DEG:
HTM_OPTION (HTM_Type_UNSIGNED,&ScopeUnsigned,
Gbl.Scope.Current == Scope, // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%s: %s",
Txt_Degree,
Gbl.Hierarchy.Deg.ShrtName);
@@ -146,7 +146,7 @@ void Sco_PutSelectorScope (const char *ParName,HTM_SubmitOnChange_t SubmitOnChan
case HieLvl_CRS:
HTM_OPTION (HTM_Type_UNSIGNED,&ScopeUnsigned,
Gbl.Scope.Current == Scope, // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%s: %s",
Txt_Course,
Gbl.Hierarchy.Crs.ShrtName);
diff --git a/swad_search.c b/swad_search.c
index f0902bf8..07a72677 100644
--- a/swad_search.c
+++ b/swad_search.c
@@ -201,7 +201,7 @@ static void Sch_PutFormToSearchWithWhatToSearchAndScope (HieLvl_Level_t DefaultS
WTS = (unsigned) WhatToSearch;
HTM_OPTION (HTM_Type_UNSIGNED,&WTS,
WhatToSearch == Search->WhatToSearch, // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%s",*Titles[WhatToSearch]);
}
HTM_SELECT_End ();
diff --git a/swad_statistic.c b/swad_statistic.c
index b3a7d55e..c8935f1b 100644
--- a/swad_statistic.c
+++ b/swad_statistic.c
@@ -371,7 +371,7 @@ static void Sta_PutFormCrsHits (struct Sta_Stats *Stats)
ClicksGroupedByUnsigned = (unsigned) ClicksGroupedBy;
HTM_OPTION (HTM_Type_UNSIGNED,&ClicksGroupedByUnsigned,
ClicksGroupedBy == Stats->ClicksGroupedBy, // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%s",Txt_STAT_CLICKS_GROUPED_BY[ClicksGroupedBy]);
}
HTM_SELECT_End ();
@@ -408,7 +408,7 @@ static void Sta_PutFormCrsHits (struct Sta_Stats *Stats)
i++)
HTM_OPTION (HTM_Type_UNSIGNED,&RowsPerPage[i],
RowsPerPage[i] == Stats->RowsPerPage, // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%u",RowsPerPage[i]);
HTM_SELECT_End ();
HTM_Txt (")");
@@ -520,7 +520,7 @@ static void Sta_PutFormGblHits (struct Sta_Stats *Stats)
RoleStatUnsigned = (unsigned) RoleStat;
HTM_OPTION (HTM_Type_UNSIGNED,&RoleStatUnsigned,
RoleStat == Stats->Role, // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%s",Txt_ROLE_STATS[RoleStat]);
}
HTM_SELECT_End ();
@@ -581,7 +581,7 @@ static void Sta_PutFormGblHits (struct Sta_Stats *Stats)
ClicksGroupedByUnsigned = (unsigned) ClicksGroupedBy;
HTM_OPTION (HTM_Type_UNSIGNED,&ClicksGroupedByUnsigned,
ClicksGroupedBy == Stats->ClicksGroupedBy, // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%s",Txt_STAT_CLICKS_GROUPED_BY[ClicksGroupedBy]);
}
HTM_SELECT_End ();
@@ -662,7 +662,7 @@ static void Sta_WriteSelectorCountType (const struct Sta_Stats *Stats)
StatCountTypeUnsigned = (unsigned) StatCountType;
HTM_OPTION (HTM_Type_UNSIGNED,&StatCountTypeUnsigned,
StatCountType == Stats->CountType, // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%s",Txt_STAT_TYPE_COUNT_SMALL[StatCountType]);
}
HTM_SELECT_End ();
@@ -694,7 +694,7 @@ static void Sta_WriteSelectorAction (const struct Sta_Stats *Stats)
The_GetSuffix ());
HTM_OPTION (HTM_Type_STRING,"0",
Stats->NumAction == 0, // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%s",Txt_Any_action);
for (Action = (Act_Action_t) 1;
Action <= (Act_Action_t) (ActLst_NUM_ACTIONS - 1);
@@ -704,7 +704,7 @@ static void Sta_WriteSelectorAction (const struct Sta_Stats *Stats)
ActionUnsigned = (unsigned) Action;
HTM_OPTION (HTM_Type_UNSIGNED,&ActionUnsigned,
Action == Stats->NumAction, // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%u: %s > %s",
(unsigned) Action,Txt_TABS_TXT[Tab],Act_GetActionText (Action));
}
@@ -1621,7 +1621,7 @@ static void Sta_ShowDistrAccessesPerDayAndHour (const struct Sta_Stats *Stats,
ColorTypeUnsigned = (unsigned) ColorType;
HTM_OPTION (HTM_Type_UNSIGNED,&ColorTypeUnsigned,
ColorType == SelectedColorType, // Selected?
- false, // Not selected
+ HTM_OPTION_ENABLED,
"%s",Txt_STAT_COLOR_TYPES[ColorType]);
}
HTM_SELECT_End ();
diff --git a/swad_test_print.c b/swad_test_print.c
index 4848f85e..ab0be2ac 100644
--- a/swad_test_print.c
+++ b/swad_test_print.c
@@ -399,15 +399,15 @@ static void TstPrn_WriteTF_AnsToFill (const struct TstPrn_PrintedQuestion *Print
QstInd,The_GetSuffix ());
HTM_OPTION (HTM_Type_STRING,"" ,
PrintedQuestion->StrAnswers[0] == '\0', // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
" ");
HTM_OPTION (HTM_Type_STRING,"T",
PrintedQuestion->StrAnswers[0] == 'T', // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%s",Txt_TF_QST[0]);
HTM_OPTION (HTM_Type_STRING,"F",
PrintedQuestion->StrAnswers[0] == 'F', // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%s",Txt_TF_QST[1]);
HTM_SELECT_End ();
}
diff --git a/swad_timetable.c b/swad_timetable.c
index 11bb3845..f582f2e9 100644
--- a/swad_timetable.c
+++ b/swad_timetable.c
@@ -1526,7 +1526,7 @@ static void Tmt_TimeTableDrawCellEdit (const struct Tmt_Timetable *Timetable,
((Timetable->View == Tmt_TUT_EDIT) && (CT == Tmt_TUTORING)))
HTM_OPTION (HTM_Type_STRING,Tmt_DB_ClassType[CT],
CT == ClassType, // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%s",Txt_TIMETABLE_CLASS_TYPES[CT]);
HTM_SELECT_End ();
@@ -1574,7 +1574,7 @@ static void Tmt_TimeTableDrawCellEdit (const struct Tmt_Timetable *Timetable,
Err_NotEnoughMemoryExit ();
HTM_OPTION (HTM_Type_STRING,TTDur,
Dur == DurationNumIntervals, // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%s",TTDur);
free (TTDur);
}
@@ -1601,7 +1601,7 @@ static void Tmt_TimeTableDrawCellEdit (const struct Tmt_Timetable *Timetable,
The_GetSuffix ());
HTM_OPTION (HTM_Type_STRING,"-1",
GrpCod <= 0, // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%s",Txt_All_groups);
for (NumGrpTyp = 0;
NumGrpTyp < Gbl.Crs.Grps.GrpTypes.NumGrpTypes;
@@ -1626,7 +1626,7 @@ static void Tmt_TimeTableDrawCellEdit (const struct Tmt_Timetable *Timetable,
}
HTM_OPTION (HTM_Type_LONG,&Grp->GrpCod,
GrpCod == Grp->GrpCod, // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%s %s%s",
GrpTyp->GrpTypName,Grp->GrpName,Room);
free (Room);
diff --git a/swad_user.c b/swad_user.c
index 17a2822b..0d481261 100644
--- a/swad_user.c
+++ b/swad_user.c
@@ -6228,7 +6228,7 @@ void Usr_PutSelectorNumColsClassPhoto (void)
Cols++)
HTM_OPTION (HTM_Type_UNSIGNED,&Cols,
Cols == Gbl.Usrs.ClassPhoto.Cols, // Selected?
- false, // Not disabled
+ HTM_OPTION_ENABLED,
"%u",Cols);
/***** End selector *****/