From 2b4c87e5726b4a9dcd7e63e7eac00eec003f1681 Mon Sep 17 00:00:00 2001
From: acanas <acanas@ugr.es>
Date: Wed, 24 Apr 2024 18:34:36 +0200
Subject: [PATCH] Version 23.79.2:  Apr 24, 2024  Code refactoring in HTML
 related to disabled field in forms.

---
 swad_HTML.c      | 10 ++++++----
 swad_HTML.h      |  6 ++++--
 swad_changelog.h |  5 +++--
 swad_constant.c  |  8 ++++++++
 swad_date.c      | 23 +++++++++--------------
 swad_date.h      |  3 ++-
 swad_forum.c     |  1 +
 swad_info.c      | 20 +++++++++++---------
 swad_layout.c    |  8 +++++---
 swad_layout.h    |  3 ++-
 swad_role.c      |  7 ++++---
 swad_role.h      |  3 ++-
 12 files changed, 57 insertions(+), 40 deletions(-)

diff --git a/swad_HTML.c b/swad_HTML.c
index 83bc5c46e..76c690d3c 100644
--- a/swad_HTML.c
+++ b/swad_HTML.c
@@ -1372,7 +1372,8 @@ void HTM_INPUT_PASSWORD (const char *Name,const char *PlaceHolder,
   }
 
 void HTM_INPUT_LONG (const char *Name,long Min,long Max,long Value,
-                     HTM_SubmitOnChange_t SubmitOnChange,bool Disabled,
+                     HTM_SubmitOnChange_t SubmitOnChange,
+                     Cns_DisabledOrEnabled_t DisabledOrEnabled,
 	             const char *fmt,...)
   {
    va_list ap;
@@ -1381,7 +1382,7 @@ void HTM_INPUT_LONG (const char *Name,long Min,long Max,long Value,
 
    HTM_TxtF ("<input type=\"number\" name=\"%s\" min=\"%ld\" max=\"%ld\" value=\"%ld\"",
 	     Name,Min,Max,Value);
-   if (Disabled)
+   if (DisabledOrEnabled == Cns_DISABLED)
       HTM_Txt (" disabled=\"disabled\"");
 
    if (fmt)
@@ -1410,7 +1411,8 @@ void HTM_INPUT_LONG (const char *Name,long Min,long Max,long Value,
 void HTM_INPUT_FLOAT (const char *Name,double Min,double Max,
 		      double Step,	// Use 0 for "any"
 		      double Value,
-                      HTM_SubmitOnChange_t SubmitOnChange,bool Disabled,
+                      HTM_SubmitOnChange_t SubmitOnChange,
+                      Cns_DisabledOrEnabled_t DisabledOrEnabled,
 	              const char *fmt,...)
   {
    va_list ap;
@@ -1428,7 +1430,7 @@ void HTM_INPUT_FLOAT (const char *Name,double Min,double Max,
       HTM_TxtF (" step=\"%.15lg\"",Step);
    HTM_TxtF (" value=\"%.15lg\"",Value);
    Str_SetDecimalPointToLocal ();	// Return to local system
-   if (Disabled)
+   if (DisabledOrEnabled == Cns_DISABLED)
       HTM_Txt (" disabled=\"disabled\"");
 
    if (fmt)
diff --git a/swad_HTML.h b/swad_HTML.h
index 5a18a095a..da5d66844 100644
--- a/swad_HTML.h
+++ b/swad_HTML.h
@@ -185,12 +185,14 @@ void HTM_INPUT_PASSWORD (const char *Name,const char *PlaceHolder,
 			 const char *AutoComplete,HTM_Required_t Required,
 	                 const char *fmt,...);
 void HTM_INPUT_LONG (const char *Name,long Min,long Max,long Value,
-                     HTM_SubmitOnChange_t SubmitOnChange,bool Disabled,
+                     HTM_SubmitOnChange_t SubmitOnChange,
+                     Cns_DisabledOrEnabled_t DisabledOrEnabled,
 	             const char *fmt,...);
 void HTM_INPUT_FLOAT (const char *Name,double Min,double Max,
 		      double Step,	// Use 0 for "any"
 		      double Value,
-                      HTM_SubmitOnChange_t SubmitOnChange,bool Disabled,
+                      HTM_SubmitOnChange_t SubmitOnChange,
+                      Cns_DisabledOrEnabled_t DisabledOrEnabled,
 	              const char *fmt,...);
 void HTM_INPUT_RADIO (const char *Name,HTM_SubmitOnClick_t SubmitOnClick,
 		      const char *fmt,...);
diff --git a/swad_changelog.h b/swad_changelog.h
index 5d84ff569..56fdf9d14 100644
--- a/swad_changelog.h
+++ b/swad_changelog.h
@@ -633,11 +633,12 @@ Me sale este error, no s
 "can npt create received message (duplicated entry '243218-2160773' for key 'UsrCod_MsgCod')
 */
 
-#define Log_PLATFORM_VERSION	"SWAD 23.79 (2024-04-24)"
+#define Log_PLATFORM_VERSION	"SWAD 23.79.2 (2024-04-24)"
 #define CSS_FILE		"swad23.67.2.css"
 #define JS_FILE			"swad23.79.js"
 /*
-	Version 23.79.1:  Apr 24, 2024  Code refactoring in HTML related to required field in form. (335751 lines)
+	Version 23.79.2:  Apr 24, 2024  Code refactoring in HTML related to disabled field in forms. (335766 lines)
+	Version 23.79.1:  Apr 24, 2024  Code refactoring in HTML related to required field in forms. (335751 lines)
 	Version 23.79:    Apr 24, 2024  Code refactoring writing dates. (335741 lines)
 	Version 23.78:    Apr 23, 2024  Code refactoring in list of actions. (335577 lines)
 	Version 23.77:    Apr 19, 2024  Code refactoring in list of actions. (335567 lines)
diff --git a/swad_constant.c b/swad_constant.c
index a744f2dc1..f52817053 100644
--- a/swad_constant.c
+++ b/swad_constant.c
@@ -25,10 +25,18 @@
 /*********************************** Headers *********************************/
 /*****************************************************************************/
 
+#include "swad_constant.h"
+
 /*****************************************************************************/
 /***************************** Public constants ******************************/
 /*****************************************************************************/
 
+const char *Cns_DisabledTxt[Cns_NUM_DISABLED_ENABLED] =
+  {
+   [Cns_DISABLED] = " disabled=\"disabled\"",
+   [Cns_ENABLED ] = "",
+  };
+
 /*****************************************************************************/
 /**************************** Private constants ******************************/
 /*****************************************************************************/
diff --git a/swad_date.c b/swad_date.c
index cd792378f..7bee276da 100644
--- a/swad_date.c
+++ b/swad_date.c
@@ -986,8 +986,10 @@ See also http://www.ashleyit.com/rs/jsrs/select/php/select.php
 void Dat_WriteFormDate (unsigned FirstYear,unsigned LastYear,
 	                const char *Id,
 		        struct Dat_Date *DateSelected,
-                        HTM_SubmitOnChange_t SubmitOnChange,bool Disabled)
+                        HTM_SubmitOnChange_t SubmitOnChange,
+                        Cns_DisabledOrEnabled_t DisabledOrEnabled)
   {
+   extern const char *Cns_DisabledTxt[Cns_NUM_DISABLED_ENABLED];
    extern const char *Txt_MONTHS_SMALL[12];
    char *FuncOnChange;
    unsigned Year;
@@ -995,7 +997,6 @@ void Dat_WriteFormDate (unsigned FirstYear,unsigned LastYear,
    unsigned Day;
    unsigned NumDaysSelectedMonth;
 
-
    if (asprintf (&FuncOnChange,"adjustDateForm('%s');",Id) < 0)
       Err_NotEnoughMemoryExit ();
 
@@ -1004,10 +1005,8 @@ void Dat_WriteFormDate (unsigned FirstYear,unsigned LastYear,
       HTM_SELECT_Begin (SubmitOnChange,FuncOnChange,
 			"id=\"%sYear\" name=\"%sYear\""
 			" class=\"INPUT_%s\"%s",
-			Id,Id,
-			The_GetSuffix (),
-			Disabled ? " disabled=\"disabled\"" :
-				   "");
+			Id,Id,The_GetSuffix (),
+			Cns_DisabledTxt[DisabledOrEnabled]);
 	 HTM_OPTION (HTM_Type_STRING,"0",
 		     HTM_OPTION_UNSELECTED,
 		     HTM_OPTION_ENABLED,
@@ -1028,10 +1027,8 @@ void Dat_WriteFormDate (unsigned FirstYear,unsigned LastYear,
       HTM_SELECT_Begin (SubmitOnChange,FuncOnChange,
 			"id=\"%sMonth\" name=\"%sMonth\""
 			" class=\"INPUT_%s\"%s",
-			Id,Id,
-			The_GetSuffix (),
-			Disabled ? " disabled=\"disabled\"" :
-				   "");
+			Id,Id,The_GetSuffix (),
+			Cns_DisabledTxt[DisabledOrEnabled]);
 	 HTM_OPTION (HTM_Type_STRING,"0",
 		     HTM_OPTION_UNSELECTED,
 		     HTM_OPTION_ENABLED,
@@ -1054,10 +1051,8 @@ void Dat_WriteFormDate (unsigned FirstYear,unsigned LastYear,
       HTM_SELECT_Begin (SubmitOnChange,NULL,
 			"id=\"%sDay\" name=\"%sDay\""
 			" class=\"INPUT_%s\"%s",
-			Id,Id,
-			The_GetSuffix (),
-			Disabled ? " disabled=\"disabled\"" :
-				   "");
+			Id,Id,The_GetSuffix (),
+			Cns_DisabledTxt[DisabledOrEnabled]);
 	    HTM_OPTION (HTM_Type_STRING,"0",
 			HTM_OPTION_UNSELECTED,
 			HTM_OPTION_ENABLED,
diff --git a/swad_date.h b/swad_date.h
index daaa92bc5..b961505d2 100644
--- a/swad_date.h
+++ b/swad_date.h
@@ -194,7 +194,8 @@ void Dat_GetBrowserTimeZone (char BrowserTimeZone[Dat_MAX_BYTES_TIME_ZONE + 1]);
 void Dat_WriteFormDate (unsigned FirstYear,unsigned LastYear,
 	                const char *Id,
 		        struct Dat_Date *DateSelected,
-                        HTM_SubmitOnChange_t SubmitOnChange,bool Disabled);
+                        HTM_SubmitOnChange_t SubmitOnChange,
+                        Cns_DisabledOrEnabled_t DisabledOrEnabled);
 void Dat_GetDateFromForm (const char *ParNameDay,const char *ParNameMonth,const char *ParNameYear,
                           unsigned *Day,unsigned *Month,unsigned *Year);
 
diff --git a/swad_forum.c b/swad_forum.c
index eed338a8a..75a6912b7 100644
--- a/swad_forum.c
+++ b/swad_forum.c
@@ -990,6 +990,7 @@ static void For_ShowAForumPost (struct For_Forums *Forums,
                HTM_TxtF ("[%s]",Txt_FORUM_Post_banned);
                break;
             case Cns_ENABLED:
+            default:
 	       if (Subject[0])
 		  HTM_Txt (Subject);
 	       else
diff --git a/swad_info.c b/swad_info.c
index 13c5866f4..b819cdcfd 100644
--- a/swad_info.c
+++ b/swad_info.c
@@ -132,7 +132,8 @@ static Act_Action_t Inf_ActionsInfo[Inf_NUM_SOURCES][Inf_NUM_TYPES] =
 /*****************************************************************************/
 
 static void Inf_PutIconToViewInfo (void *Type);
-static void Inf_PutCheckboxForceStdsToReadInfo (bool MustBeRead,bool Disabled);
+static void Inf_PutCheckboxForceStdsToReadInfo (bool MustBeRead,
+						Cns_DisabledOrEnabled_t DisabledOrEnabled);
 static void Inf_PutCheckboxConfirmIHaveReadInfo (void);
 static bool Inf_GetMustBeReadFromForm (void);
 static bool Inf_GetIfIHaveReadFromForm (void);
@@ -175,10 +176,9 @@ void Inf_ShowInfo (void)
    extern const char *Txt_No_information;
    struct Syl_Syllabus Syllabus;
    struct Inf_FromDB FromDB;
-   bool Disabled;
    Usr_Can_t ICanEdit = (Gbl.Usrs.Me.Role.Logged == Rol_TCH ||
-                          Gbl.Usrs.Me.Role.Logged == Rol_SYS_ADM) ? Usr_CAN :
-                        					    Usr_CAN_NOT;
+                         Gbl.Usrs.Me.Role.Logged == Rol_SYS_ADM) ? Usr_CAN :
+                        					   Usr_CAN_NOT;
    bool ShowWarningNoInfo = false;
    static void (*FunctionToDrawContextualIcons[Usr_NUM_CAN]) (void *Args) =
      {
@@ -232,10 +232,11 @@ void Inf_ShowInfo (void)
          if (FromDB.Src != Inf_NONE)
            {
             /***** Contextual menu *****/
+            // Checkbox to force students to read this couse info
             Mnu_ContextMenuBegin ();
-	       Disabled = (Gbl.Usrs.Me.Role.Logged == Rol_NET);	// Non-editing teachers can not change the status of checkbox
-	       Inf_PutCheckboxForceStdsToReadInfo (FromDB.MustBeRead,Disabled);	// Checkbox to force students...
-										// ...to read this couse info
+	       Inf_PutCheckboxForceStdsToReadInfo (FromDB.MustBeRead,
+						   (Gbl.Usrs.Me.Role.Logged == Rol_NET) ? Cns_DISABLED :
+											  Cns_ENABLED);	// Non-editing teachers can not change the status of checkbox);
             Mnu_ContextMenuEnd ();
            }
          break;
@@ -346,7 +347,8 @@ void Inf_PutIconToEditInfo (void *Type)
 /********** Put a form (checkbox) to force students to read info *************/
 /*****************************************************************************/
 
-static void Inf_PutCheckboxForceStdsToReadInfo (bool MustBeRead,bool Disabled)
+static void Inf_PutCheckboxForceStdsToReadInfo (bool MustBeRead,
+						Cns_DisabledOrEnabled_t DisabledOrEnabled)
   {
    extern Syl_WhichSyllabus_t Syl_WhichSyllabus[Syl_NUM_WHICH_SYLLABUS];
    extern const char *Txt_Force_students_to_read_this_information;
@@ -366,7 +368,7 @@ static void Inf_PutCheckboxForceStdsToReadInfo (bool MustBeRead,bool Disabled)
                               Inf_Actions[Gbl.Crs.Info.Type].FuncPars,
                               Inf_Actions[Gbl.Crs.Info.Type].Args,
                               "MustBeRead",
-                              MustBeRead,Disabled,
+                              MustBeRead,DisabledOrEnabled,
                               Txt_Force_students_to_read_this_information,
                               Txt_Force_students_to_read_this_information);
   }
diff --git a/swad_layout.c b/swad_layout.c
index 653132147..597712dac 100644
--- a/swad_layout.c
+++ b/swad_layout.c
@@ -1266,9 +1266,12 @@ void Lay_PutContextualLinkIconText (Act_Action_t NextAction,const char *Anchor,
 void Lay_PutContextualCheckbox (Act_Action_t NextAction,
 				void (*FuncPars) (void *Args),void *Args,
                                 const char *CheckboxName,
-                                bool Checked,bool Disabled,
+                                bool Checked,
+                                Cns_DisabledOrEnabled_t DisabledOrEnabled,
                                 const char *Title,const char *Text)
   {
+   extern const char *Cns_DisabledTxt[Cns_NUM_DISABLED_ENABLED];
+
    /***** Separator *****/
    if (Text)
       HTM_SP ();	// This space is necessary to enable
@@ -1294,8 +1297,7 @@ void Lay_PutContextualCheckbox (Act_Action_t NextAction,
 				"value=\"Y\"%s%s",
 				Checked ? " checked=\"checked\"" :
 					  "",
-				Disabled ? " disabled=\"disabled\"" :
-					   "");
+				Cns_DisabledTxt[DisabledOrEnabled]);
 
 	    /***** Text *****/
 	    if (Text)
diff --git a/swad_layout.h b/swad_layout.h
index 523d20e41..bf8be93cc 100644
--- a/swad_layout.h
+++ b/swad_layout.h
@@ -81,7 +81,8 @@ void Lay_PutContextualLinkIconText (Act_Action_t NextAction,const char *Anchor,
 void Lay_PutContextualCheckbox (Act_Action_t NextAction,
                                 void (*FuncPars) (void *Args),void *Args,
                                 const char *CheckboxName,
-                                bool Checked,bool Disabled,
+                                bool Checked,
+                                Cns_DisabledOrEnabled_t DisabledOrEnabled,
                                 const char *Title,const char *Text);
 
 void Lay_WriteAboutZone (void);
diff --git a/swad_role.c b/swad_role.c
index ff8441dbb..4cb5420cc 100644
--- a/swad_role.c
+++ b/swad_role.c
@@ -512,8 +512,10 @@ void Rol_ChangeMyRole (void)
 /*****************************************************************************/
 
 void Rol_WriteSelectorRoles (unsigned RolesAllowed,unsigned RolesSelected,
-                             bool Disabled,HTM_SubmitOnChange_t SubmitOnChange)
+                             Cns_DisabledOrEnabled_t DisabledOrEnabled,
+                             HTM_SubmitOnChange_t SubmitOnChange)
   {
+   extern const char *Cns_DisabledTxt[Cns_NUM_DISABLED_ENABLED];
    extern const char *Txt_ROLES_PLURAL_abc[Rol_NUM_ROLES][Usr_NUM_SEXS];
    Rol_Role_t Role;
 
@@ -529,8 +531,7 @@ void Rol_WriteSelectorRoles (unsigned RolesAllowed,unsigned RolesSelected,
 				The_GetSuffix (),
 				(RolesSelected & (1 << Role)) ? " checked=\"checked\"" :
 								"",
-				Disabled ? " disabled=\"disabled\"" :
-					   "");
+				Cns_DisabledTxt[DisabledOrEnabled]);
 	    HTM_Txt (Txt_ROLES_PLURAL_abc[Role][Usr_SEX_UNKNOWN]);
 	 HTM_LABEL_End ();
 	 HTM_BR ();
diff --git a/swad_role.h b/swad_role.h
index 58e782bfb..f2f632e9a 100644
--- a/swad_role.h
+++ b/swad_role.h
@@ -53,7 +53,8 @@ void Rol_PutFormToChangeMyRole (const char *ClassSelect);
 void Rol_ChangeMyRole (void);
 
 void Rol_WriteSelectorRoles (unsigned RolesAllowed,unsigned RolesSelected,
-                             bool Disabled,HTM_SubmitOnChange_t SubmitOnChange);
+                             Cns_DisabledOrEnabled_t DisabledOrEnabled,
+                             HTM_SubmitOnChange_t SubmitOnChange);
 void Rol_PutParRoles (unsigned Roles);
 unsigned Rol_GetSelectedRoles (void);