Marown/swad-core
Marown
/
swad-core
mirror of https://github.com/acanas/swad-core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Version 22.46.3: Oct 15, 2022 Code refactoring submiting forms.

This commit is contained in:
acanas 2022-10-14 23:59:56 +02:00
parent 7b260ed625
commit 80a32b1f05
7 changed files with 35 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
swad_HTML.c
View File

@ -1064,8 +1064,7 @@ void HTM_INPUT_TEXT (const char *Name,unsigned MaxLength,const char *Value,
} }
if (SubmitOnChange == HTM_SUBMIT_ON_CHANGE) if (SubmitOnChange == HTM_SUBMIT_ON_CHANGE)
HTM_TxtF (" onchange=\"document.getElementById('%s').submit();return false;\"", HTM_Txt (" onchange=\"this.form.submit();return false;\"");
Gbl.Form.Id);
HTM_Txt (" />"); HTM_Txt (" />");
} }
@ -1129,8 +1128,7 @@ void HTM_INPUT_TEL (const char *Name,const char *Value,
} }
if (SubmitOnChange == HTM_SUBMIT_ON_CHANGE) if (SubmitOnChange == HTM_SUBMIT_ON_CHANGE)
HTM_TxtF (" onchange=\"document.getElementById('%s').submit();return false;\"", HTM_Txt (" onchange=\"this.form.submit();return false;\"");
Gbl.Form.Id);
HTM_Txt (" />"); HTM_Txt (" />");
} }
@ -1194,8 +1192,7 @@ void HTM_INPUT_URL (const char *Name,const char *Value,
} }
if (SubmitOnChange == HTM_SUBMIT_ON_CHANGE) if (SubmitOnChange == HTM_SUBMIT_ON_CHANGE)
HTM_TxtF (" onchange=\"document.getElementById('%s').submit();return false;\"", HTM_Txt (" onchange=\"this.form.submit();return false;\"");
Gbl.Form.Id);
HTM_Txt (" />"); HTM_Txt (" />");
} }
@ -1229,8 +1226,7 @@ void HTM_INPUT_FILE (const char *Name,const char *Accept,
} }
if (SubmitOnChange == HTM_SUBMIT_ON_CHANGE) if (SubmitOnChange == HTM_SUBMIT_ON_CHANGE)
HTM_TxtF (" onchange=\"document.getElementById('%s').submit();return false;\"", HTM_Txt (" onchange=\"this.form.submit();return false;\"");
Gbl.Form.Id);
HTM_Txt (" />"); HTM_Txt (" />");
} }
@ -1348,8 +1344,7 @@ void HTM_INPUT_LONG (const char *Name,long Min,long Max,long Value,
} }
if (SubmitOnChange == HTM_SUBMIT_ON_CHANGE) if (SubmitOnChange == HTM_SUBMIT_ON_CHANGE)
HTM_TxtF (" onchange=\"document.getElementById('%s').submit();return false;\"", HTM_Txt (" onchange=\"this.form.submit();return false;\"");
Gbl.Form.Id);
HTM_Txt (" />"); HTM_Txt (" />");
} }
@ -1424,8 +1419,7 @@ void HTM_INPUT_RADIO (const char *Name,bool SubmitOnClick,
} }
if (SubmitOnClick) if (SubmitOnClick)
HTM_TxtF (" onchange=\"document.getElementById('%s').submit();return false;\"", HTM_Txt (" onchange=\"this.form.submit();return false;\"");
Gbl.Form.Id);
HTM_Txt (" />"); HTM_Txt (" />");
} }
@ -1456,8 +1450,7 @@ void HTM_INPUT_CHECKBOX (const char *Name,HTM_SubmitOnChange_t SubmitOnChange,
} }
if (SubmitOnChange == HTM_SUBMIT_ON_CHANGE) if (SubmitOnChange == HTM_SUBMIT_ON_CHANGE)
HTM_TxtF (" onchange=\"document.getElementById('%s').submit();return false;\"", HTM_Txt (" onchange=\"this.form.submit();return false;\"");
Gbl.Form.Id);
HTM_Txt (" />"); HTM_Txt (" />");
} }
@ -1627,8 +1620,7 @@ void HTM_SELECT_Begin (HTM_SubmitOnChange_t SubmitOnChange,
HTM_SELECT_BeginWithoutAttr (); HTM_SELECT_BeginWithoutAttr ();
if (SubmitOnChange == HTM_SUBMIT_ON_CHANGE) if (SubmitOnChange == HTM_SUBMIT_ON_CHANGE)
HTM_TxtF (" onchange=\"document.getElementById('%s').submit();return false;\"", HTM_Txt (" onchange=\"this.form.submit();return false;\"");
Gbl.Form.Id);
HTM_Txt (" />"); HTM_Txt (" />");
HTM_SELECT_NestingLevel++; HTM_SELECT_NestingLevel++;

3
swad_center_config.c
View File

@ -465,8 +465,7 @@ static void CtrCfg_Photo (bool PrintView,bool PutForm,bool PutLink,
HTM_DIV_Begin ("class=\"CM\""); HTM_DIV_Begin ("class=\"CM\"");
Frm_BeginForm (ActChgCtrPhoAtt); Frm_BeginForm (ActChgCtrPhoAtt);
HTM_TEXTAREA_Begin ("id=\"AttributionArea\" name=\"Attribution\" rows=\"3\"" HTM_TEXTAREA_Begin ("id=\"AttributionArea\" name=\"Attribution\" rows=\"3\""
" onchange=\"document.getElementById('%s').submit();return false;\"", " onchange=\"this.form.submit();return false;\"");
Gbl.Form.Id);
if (PhotoAttribution) if (PhotoAttribution)
HTM_Txt (PhotoAttribution); HTM_Txt (PhotoAttribution);
HTM_TEXTAREA_End (); HTM_TEXTAREA_End ();

3
swad_changelog.h
View File

@ -606,10 +606,11 @@ TODO: Fix bug: error al enviar un mensaje a dos recipientes, error on duplicate
TODO: Attach pdf files in multimedia. TODO: Attach pdf files in multimedia.
*/ */
#define Log_PLATFORM_VERSION "SWAD 22.46.2 (2022-10-14)" #define Log_PLATFORM_VERSION "SWAD 22.46.3 (2022-10-15)"
#define CSS_FILE "swad22.46.css" #define CSS_FILE "swad22.46.css"
#define JS_FILE "swad21.100.js" #define JS_FILE "swad21.100.js"
/* /*
Version 22.46.3: Oct 15, 2022 Code refactoring submiting forms. (333211 lines)
Version 22.46.2: Oct 14, 2022 Changes in anchors behavior in project listing. (333228 lines) Version 22.46.2: Oct 14, 2022 Changes in anchors behavior in project listing. (333228 lines)
Version 22.46.1: Oct 14, 2022 Fixed bug filtering projects by department. (333227 lines) Version 22.46.1: Oct 14, 2022 Fixed bug filtering projects by department. (333227 lines)
Version 22.46: Oct 13, 2022 Review of projects. (333219 lines) Version 22.46: Oct 13, 2022 Review of projects. (333219 lines)

3
swad_country_config.c
View File

@ -334,8 +334,7 @@ static void CtyCfg_MapImage (bool PrintView,bool PutLink)
HTM_DIV_Begin ("class=\"CM\""); HTM_DIV_Begin ("class=\"CM\"");
Frm_BeginForm (ActChgCtyMapAtt); Frm_BeginForm (ActChgCtyMapAtt);
HTM_TEXTAREA_Begin ("id=\"AttributionArea\" name=\"Attribution\" rows=\"3\"" HTM_TEXTAREA_Begin ("id=\"AttributionArea\" name=\"Attribution\" rows=\"3\""
" onchange=\"document.getElementById('%s').submit();return false;\"", " onchange=\"this.form.submit();return false;\"");
Gbl.Form.Id);
if (MapAttribution) if (MapAttribution)
HTM_Txt (MapAttribution); HTM_Txt (MapAttribution);
HTM_TEXTAREA_End (); HTM_TEXTAREA_End ();

36
swad_date.c
View File

@ -587,11 +587,10 @@ void Dat_WriteFormClientLocalDateTimeFromTimeUTC (const char *Id,
" onchange=\"" " onchange=\""
"adjustDateForm('%s');" "adjustDateForm('%s');"
"setUTCFromLocalDateTimeForm('%s');" "setUTCFromLocalDateTimeForm('%s');"
"document.getElementById('%s').submit();return false;\"", "this.form.submit();return false;\"",
Id,ParamName, Id,ParamName,
The_GetSuffix (), The_GetSuffix (),
Id,Id, Id,Id);
Gbl.Form.Id);
else else
HTM_SELECT_Begin (HTM_DONT_SUBMIT_ON_CHANGE, HTM_SELECT_Begin (HTM_DONT_SUBMIT_ON_CHANGE,
"id=\"%sYear\" name=\"%sYear\"" "id=\"%sYear\" name=\"%sYear\""
@ -619,11 +618,10 @@ void Dat_WriteFormClientLocalDateTimeFromTimeUTC (const char *Id,
" onchange=\"" " onchange=\""
"adjustDateForm('%s');" "adjustDateForm('%s');"
"setUTCFromLocalDateTimeForm('%s');" "setUTCFromLocalDateTimeForm('%s');"
"document.getElementById('%s').submit();return false;\"", "this.form.submit();return false;\"",
Id,ParamName, Id,ParamName,
The_GetSuffix (), The_GetSuffix (),
Id,Id, Id,Id);
Gbl.Form.Id);
else else
HTM_SELECT_Begin (HTM_DONT_SUBMIT_ON_CHANGE, HTM_SELECT_Begin (HTM_DONT_SUBMIT_ON_CHANGE,
"id=\"%sMonth\" name=\"%sMonth\"" "id=\"%sMonth\" name=\"%sMonth\""
@ -649,10 +647,10 @@ void Dat_WriteFormClientLocalDateTimeFromTimeUTC (const char *Id,
"id=\"%sDay\" name=\"%sDay\"" "id=\"%sDay\" name=\"%sDay\""
" class=\"INPUT_%s\"" " class=\"INPUT_%s\""
" onchange=\"setUTCFromLocalDateTimeForm('%s');" " onchange=\"setUTCFromLocalDateTimeForm('%s');"
"document.getElementById('%s').submit();return false;\"", "this.form.submit();return false;\"",
Id,ParamName, Id,ParamName,
The_GetSuffix (), The_GetSuffix (),
Id,Gbl.Form.Id); Id);
else else
HTM_SELECT_Begin (HTM_DONT_SUBMIT_ON_CHANGE, HTM_SELECT_Begin (HTM_DONT_SUBMIT_ON_CHANGE,
"id=\"%sDay\" name=\"%sDay\"" "id=\"%sDay\" name=\"%sDay\""
@ -676,10 +674,10 @@ void Dat_WriteFormClientLocalDateTimeFromTimeUTC (const char *Id,
"id=\"%sHour\" name=\"%sHour\"" "id=\"%sHour\" name=\"%sHour\""
" class=\"INPUT_%s\"" " class=\"INPUT_%s\""
" onchange=\"setUTCFromLocalDateTimeForm('%s');" " onchange=\"setUTCFromLocalDateTimeForm('%s');"
"document.getElementById('%s').submit();return false;\"", "this.form.submit();return false;\"",
Id,ParamName, Id,ParamName,
The_GetSuffix (), The_GetSuffix (),
Id,Gbl.Form.Id); Id);
else else
HTM_SELECT_Begin (HTM_DONT_SUBMIT_ON_CHANGE, HTM_SELECT_Begin (HTM_DONT_SUBMIT_ON_CHANGE,
"id=\"%sHour\" name=\"%sHour\"" "id=\"%sHour\" name=\"%sHour\""
@ -703,10 +701,10 @@ void Dat_WriteFormClientLocalDateTimeFromTimeUTC (const char *Id,
"id=\"%sMinute\" name=\"%sMinute\"" "id=\"%sMinute\" name=\"%sMinute\""
" class=\"INPUT_%s\"" " class=\"INPUT_%s\""
" onchange=\"setUTCFromLocalDateTimeForm('%s');" " onchange=\"setUTCFromLocalDateTimeForm('%s');"
"document.getElementById('%s').submit();return false;\"", "this.form.submit();return false;\"",
Id,ParamName, Id,ParamName,
The_GetSuffix (), The_GetSuffix (),
Id,Gbl.Form.Id); Id);
else else
HTM_SELECT_Begin (HTM_DONT_SUBMIT_ON_CHANGE, HTM_SELECT_Begin (HTM_DONT_SUBMIT_ON_CHANGE,
"id=\"%sMinute\" name=\"%sMinute\"" "id=\"%sMinute\" name=\"%sMinute\""
@ -732,10 +730,10 @@ void Dat_WriteFormClientLocalDateTimeFromTimeUTC (const char *Id,
"id=\"%sSecond\" name=\"%sSecond\"" "id=\"%sSecond\" name=\"%sSecond\""
" class=\"INPUT_%s\"" " class=\"INPUT_%s\""
" onchange=\"setUTCFromLocalDateTimeForm('%s');" " onchange=\"setUTCFromLocalDateTimeForm('%s');"
"document.getElementById('%s').submit();return false;\"", "this.form.submit();return false;\"",
Id,ParamName, Id,ParamName,
The_GetSuffix (), The_GetSuffix (),
Id,Gbl.Form.Id); Id);
else else
HTM_SELECT_Begin (HTM_DONT_SUBMIT_ON_CHANGE, HTM_SELECT_Begin (HTM_DONT_SUBMIT_ON_CHANGE,
"id=\"%sSecond\" name=\"%sSecond\"" "id=\"%sSecond\" name=\"%sSecond\""
@ -907,12 +905,11 @@ void Dat_WriteFormDate (unsigned FirstYear,unsigned LastYear,
" class=\"INPUT_%s\"" " class=\"INPUT_%s\""
"%s" "%s"
" onchange=\"adjustDateForm('%s');" " onchange=\"adjustDateForm('%s');"
"document.getElementById('%s').submit();return false;\"", "this.form.submit();return false;\"",
Id,Id, Id,Id,
The_GetSuffix (), The_GetSuffix (),
Disabled ? " disabled=\"disabled\"" : "", Disabled ? " disabled=\"disabled\"" : "",
Id, Id);
Gbl.Form.Id);
else else
HTM_SELECT_Begin (HTM_DONT_SUBMIT_ON_CHANGE, HTM_SELECT_Begin (HTM_DONT_SUBMIT_ON_CHANGE,
"id=\"%sYear\" name=\"%sYear\"" "id=\"%sYear\" name=\"%sYear\""
@ -942,12 +939,11 @@ void Dat_WriteFormDate (unsigned FirstYear,unsigned LastYear,
" class=\"INPUT_%s\"" " class=\"INPUT_%s\""
"%s" "%s"
" onchange=\"adjustDateForm('%s');" " onchange=\"adjustDateForm('%s');"
"document.getElementById('%s').submit();return false;\"", "this.form.submit();return false;\"",
Id,Id, Id,Id,
The_GetSuffix (), The_GetSuffix (),
Disabled ? " disabled=\"disabled\"" : "", Disabled ? " disabled=\"disabled\"" : "",
Id, Id);
Gbl.Form.Id);
else else
HTM_SELECT_Begin (HTM_DONT_SUBMIT_ON_CHANGE, HTM_SELECT_Begin (HTM_DONT_SUBMIT_ON_CHANGE,
"id=\"%sMonth\" name=\"%sMonth\"" "id=\"%sMonth\" name=\"%sMonth\""

13
swad_match.c
View File

@ -2704,9 +2704,8 @@ static void Mch_PutIfAnswered (const struct Mch_Match *Match,bool Answered)
HTM_BUTTON_Submit_Begin (Txt_View_my_answer, HTM_BUTTON_Submit_Begin (Txt_View_my_answer,
"class=\"BT_LINK DAT_SMALL_GREEN_%s\"" "class=\"BT_LINK DAT_SMALL_GREEN_%s\""
" onmousedown=\"document.getElementById('%s').submit();return false;\"", " onmousedown=\"this.form.submit();return false;\"",
The_GetSuffix (), The_GetSuffix ());
Gbl.Form.Id);
HTM_TxtF ("<i class=\"%s\"></i>","fas fa-check-circle"); HTM_TxtF ("<i class=\"%s\"></i>","fas fa-check-circle");
HTM_TxtF ("&nbsp;%s",Txt_MATCH_QUESTION_Answered); HTM_TxtF ("&nbsp;%s",Txt_MATCH_QUESTION_Answered);
HTM_BUTTON_End (); HTM_BUTTON_End ();
@ -2753,8 +2752,7 @@ static void Mch_PutIconToRemoveMyAnswer (const struct Mch_Match *Match)
HTM_DIV_Begin ("class=\"MCH_BIGBUTTON_CONT\""); HTM_DIV_Begin ("class=\"MCH_BIGBUTTON_CONT\"");
HTM_BUTTON_Submit_Begin (Txt_Delete_my_answer, HTM_BUTTON_Submit_Begin (Txt_Delete_my_answer,
"BT_LINK MCH_BUTTON_ON ICO_DARKRED\"" "BT_LINK MCH_BUTTON_ON ICO_DARKRED\""
" onmousedown=\"document.getElementById('%s').submit();return false;\"", " onmousedown=\"this.form.submit();return false;\"");
Gbl.Form.Id);
HTM_Txt ("<i class=\"fas fa-trash\"></i>"); HTM_Txt ("<i class=\"fas fa-trash\"></i>");
HTM_BUTTON_End (); HTM_BUTTON_End ();
HTM_DIV_End (); HTM_DIV_End ();
@ -3009,12 +3007,11 @@ static void Mch_ShowQuestionAndAnswersStd (const struct Mch_Match *Match,
HTM_BUTTON_Submit_Begin (NULL, HTM_BUTTON_Submit_Begin (NULL,
"class=\"MCH_STD_BUTTON%s BT_%c\"" "class=\"MCH_STD_BUTTON%s BT_%c\""
" onmousedown=\"document.getElementById('%s').submit();return false;\"", " onmousedown=\"this.form.submit();return false;\"",
UsrAnswer->NumOpt == (int) NumOpt && // Student's answer UsrAnswer->NumOpt == (int) NumOpt && // Student's answer
Update == Mch_CHANGE_STATUS_BY_STUDENT ? " MCH_STD_ANSWER_SELECTED" : Update == Mch_CHANGE_STATUS_BY_STUDENT ? " MCH_STD_ANSWER_SELECTED" :
"", "",
'A' + (char) NumOpt, 'A' + (char) NumOpt);
Gbl.Form.Id);
HTM_TxtF ("%c",'a' + (char) NumOpt); HTM_TxtF ("%c",'a' + (char) NumOpt);
HTM_BUTTON_End (); HTM_BUTTON_End ();

5
swad_project.c
View File

@ -1723,10 +1723,9 @@ static void Prj_ShowProjectReviewStatus (struct Prj_Projects *Projects,
HTM_TEXTAREA_Begin ("name=\"ReviewTxt\" rows=\"1\"" HTM_TEXTAREA_Begin ("name=\"ReviewTxt\" rows=\"1\""
" class=\"TITLE_DESCRIPTION_WIDTH INPUT_%s\"" " class=\"TITLE_DESCRIPTION_WIDTH INPUT_%s\""
" placeholder=\"%s&hellip;\"" " placeholder=\"%s&hellip;\""
" onchange=\"document.getElementById('%s').submit();return false;\"", " onchange=\"this.form.submit();return false;\"",
The_GetSuffix (), The_GetSuffix (),
Txt_Comments, Txt_Comments);
Gbl.Form.Id);
HTM_Txt (Projects->Prj.Review.Txt); HTM_Txt (Projects->Prj.Review.Txt);
HTM_TEXTAREA_End (); HTM_TEXTAREA_End ();
} }