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 23.38: Oct 18, 2023 Matches of a game are displayed as hidden when the game is hidden.

This commit is contained in:
acanas 2023-10-18 11:08:13 +02:00
parent 1162456ac5
commit 9a9806570d
21 changed files with 116 additions and 190 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
swad_HTML.c
View File

@ -2063,6 +2063,13 @@ void HTM_TD_Txt_Right (const char *Txt)
HTM_TD_End ();
}
void HTM_TD_TxtColon (const char *Txt)
{
HTM_TD_Begin ("class=\"RT FORM_IN_%s\"",The_GetSuffix ());
HTM_TxtColon (Txt);
HTM_TD_End ();
}
void HTM_TD_LINE_TOP_Txt (const char *Txt)
{
HTM_TD_Begin ("class=\"LM DAT_STRONG_%s LINE_TOP\"",The_GetSuffix ());

1
swad_HTML.h
View File

@ -244,6 +244,7 @@ void HTM_Percentage (double Percentage);
void HTM_TD_Txt_Left (const char *Txt);
void HTM_TD_Txt_Right (const char *Txt);
void HTM_TD_TxtColon (const char *Txt);
void HTM_TD_LINE_TOP_Txt (const char *Txt);
void HTM_TD_Unsigned (unsigned Num);
void HTM_TD_LINE_TOP_Unsigned (unsigned Num);

7
swad_announcement.c
View File

@ -323,11 +323,7 @@ void Ann_ShowFormAnnouncement (void)
/***** Users' roles who can view the announcement *****/
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RT FORM_IN_%s\"",The_GetSuffix ());
HTM_TxtColonNBSP (Txt_Users);
HTM_TD_End ();
HTM_TD_TxtColon (Txt_Users);
HTM_TD_Begin ("class=\"LT DAT_%s\"",The_GetSuffix ());
Rol_WriteSelectorRoles (1 << Rol_UNK |
1 << Rol_GST |
@ -341,7 +337,6 @@ void Ann_ShowFormAnnouncement (void)
1 << Rol_TCH,
false,false);
HTM_TD_End ();
HTM_TR_End ();
/***** End table, send button and end box *****/

7
swad_assignment.c
View File

@ -1268,11 +1268,7 @@ static void Asg_ShowLstGrpsToEditAssignment (long AsgCod)
{
/***** Begin box and table *****/
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RT FORM_IN_%s\"",The_GetSuffix ());
HTM_TxtColon (Txt_Groups);
HTM_TD_End ();
HTM_TD_TxtColon (Txt_Groups);
HTM_TD_Begin ("class=\"LT\"");
Box_BoxTableBegin ("100%",NULL,
@ -1309,7 +1305,6 @@ static void Asg_ShowLstGrpsToEditAssignment (long AsgCod)
Box_BoxTableEnd ();
HTM_TD_End ();
HTM_TR_End ();
}

7
swad_attendance.c
View File

@ -1087,11 +1087,7 @@ static void Att_ShowLstGrpsToEditEvent (long AttCod)
{
/***** Begin box and table *****/
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RT FORM_IN_%s\"",The_GetSuffix ());
HTM_TxtColon (Txt_Groups);
HTM_TD_End ();
HTM_TD_TxtColon (Txt_Groups);
HTM_TD_Begin ("class=\"LT\"");
Box_BoxTableBegin ("100%",NULL,
NULL,NULL,
@ -1128,7 +1124,6 @@ static void Att_ShowLstGrpsToEditEvent (long AttCod)
/***** End table and box *****/
Box_BoxTableEnd ();
HTM_TD_End ();
HTM_TR_End ();
}

5
swad_changelog.h
View File

@ -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.37 (2023-10-14)"
#define Log_PLATFORM_VERSION "SWAD 23.38 (2023-10-18)"
#define CSS_FILE "swad23.35.1.css"
#define JS_FILE "swad22.49.js"
/*
Version 23.37: Oct 14, 2023 Code refactoring in HTML. (335342 lines)
Version 23.38: Oct 18, 2023 Matches of a game are displayed as hidden when the game is hidden. (335149 lines)
Version 23.37: Oct 14, 2023 Code refactoring in HTML. (335165 lines)
Version 23.36: Oct 11, 2023 Code refactoring in HTML. (335342 lines)
Version 23.35.2: Oct 11, 2023 Fixed bugs in short/full names. (335550 lines)
Version 23.35.1: Oct 11, 2023 Changes in CSS related to short/full names. (335550 lines)

7
swad_exam.c
View File

@ -1379,15 +1379,10 @@ static void Exa_PutFormEditionExam (struct Exa_Exams *Exams,
/***** Visibility of results *****/
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RT FORM_IN_%s\"",The_GetSuffix ());
HTM_TxtColon (Txt_Result_visibility);
HTM_TD_End ();
HTM_TD_TxtColon (Txt_Result_visibility);
HTM_TD_Begin ("class=\"LB\"");
TstVis_PutVisibilityCheckboxes (Exams->Exam.Visibility);
HTM_TD_End ();
HTM_TR_End ();
/***** Exam text *****/

6
swad_exam_session.c
View File

@ -1014,11 +1014,7 @@ static void ExaSes_ShowLstGrpsToCreateSession (long SesCod)
{
/***** Begin box and table *****/
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RT FORM_IN_%s\"",The_GetSuffix ());
HTM_TxtColon (Txt_Groups);
HTM_TD_End ();
HTM_TD_TxtColon (Txt_Groups);
HTM_TD_Begin ("class=\"LT\"");
Box_BoxTableBegin ("95%",NULL,
NULL,NULL,

7
swad_game.c
View File

@ -1369,15 +1369,10 @@ static void Gam_PutFormEditionGame (struct Gam_Games *Games,
/***** Visibility of results *****/
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RT FORM_IN_%s\"",The_GetSuffix ());
HTM_TxtColon (Txt_Result_visibility);
HTM_TD_End ();
HTM_TD_TxtColon (Txt_Result_visibility);
HTM_TD_Begin ("class=\"LB\"");
TstVis_PutVisibilityCheckboxes (Games->Game.Visibility);
HTM_TD_End ();
HTM_TR_End ();
/***** Game text *****/

99
swad_match.c
View File

@ -109,10 +109,21 @@ static bool Mch_CheckIfVisibilityOfResultsCanBeChanged (const struct Mch_Match *
static void Mch_ListOneOrMoreMatchesIcons (struct Gam_Games *Games,
const struct Mch_Match *Match,
const char *Anchor);
static void Mch_ListOneOrMoreMatchesTitleGrps (const struct Mch_Match *Match,
static void Mch_ListOneOrMoreMatchesAuthor (const struct Gam_Games *Games,
const struct Mch_Match *Match);
static void Mch_ListOneOrMoreMatchesTimes (const struct Gam_Games *Games,
const struct Mch_Match *Match,
unsigned UniqueId);
static void Mch_ListOneOrMoreMatchesTitleGrps (const struct Gam_Games *Games,
const struct Mch_Match *Match,
const char *Anchor);
static void Mch_GetAndWriteNamesOfGrpsAssociatedToMatch (const struct Mch_Match *Match);
static void Mch_ListOneOrMoreMatchesStatus (struct Mch_Match *Match,unsigned NumQsts);
static void Mch_GetAndWriteNamesOfGrpsAssociatedToMatch (const struct Gam_Games *Games,
const struct Mch_Match *Match);
static void Mch_ListOneOrMoreMatchesNumPlayers (const struct Gam_Games *Games,
const struct Mch_Match *Match);
static void Mch_ListOneOrMoreMatchesStatus (const struct Gam_Games *Games,
struct Mch_Match *Match,
unsigned NumQsts);
static void Mch_PutParMchCod (void *MchCod);
static void Mch_ListOneOrMoreMatchesResult (struct Gam_Games *Games,
const struct Mch_Match *Match);
@ -411,20 +422,20 @@ static void Mch_ListOneOrMoreMatches (struct Gam_Games *Games,
if (ICanEditMatches)
Mch_ListOneOrMoreMatchesIcons (Games,&Match,Anchor);
/* Match player */
Mch_ListOneOrMoreMatchesAuthor (&Match);
/* Match author */
Mch_ListOneOrMoreMatchesAuthor (Games,&Match);
/* Start/end date/time */
Mch_ListOneOrMoreMatchesTimes (&Match,UniqueId);
Mch_ListOneOrMoreMatchesTimes (Games,&Match,UniqueId);
/* Title and groups */
Mch_ListOneOrMoreMatchesTitleGrps (&Match,Anchor);
Mch_ListOneOrMoreMatchesTitleGrps (Games,&Match,Anchor);
/* Number of players who have played the match */
Mch_ListOneOrMoreMatchesNumPlayers (&Match);
Mch_ListOneOrMoreMatchesNumPlayers (Games,&Match);
/* Match status */
Mch_ListOneOrMoreMatchesStatus (&Match,Games->Game.NumQsts);
Mch_ListOneOrMoreMatchesStatus (Games,&Match,Games->Game.NumQsts);
/* Match result visible? */
Mch_ListOneOrMoreMatchesResult (Games,&Match);
@ -553,7 +564,7 @@ static void Mch_ListOneOrMoreMatchesIcons (struct Gam_Games *Games,
if (Mch_CheckIfICanEditThisMatch (Match))
{
Games->Game.GamCod = Match->GamCod;
// Games->Game.GamCod = Match->GamCod;
Games->MchCod.Current = Match->MchCod;
/***** Put icon to remove the match *****/
@ -574,11 +585,12 @@ static void Mch_ListOneOrMoreMatchesIcons (struct Gam_Games *Games,
/************* Put a column for teacher who created the match ****************/
/*****************************************************************************/
void Mch_ListOneOrMoreMatchesAuthor (const struct Mch_Match *Match)
static void Mch_ListOneOrMoreMatchesAuthor (const struct Gam_Games *Games,
const struct Mch_Match *Match)
{
/***** Match author (teacher) *****/
HTM_TD_Begin ("class=\"LT %s\"",The_GetColorRows ());
Usr_WriteAuthor1Line (Match->UsrCod,false);
Usr_WriteAuthor1Line (Match->UsrCod,Games->Game.HiddenOrVisible);
HTM_TD_End ();
}
@ -586,10 +598,21 @@ void Mch_ListOneOrMoreMatchesAuthor (const struct Mch_Match *Match)
/***************** Put a column for match start and end times ****************/
/*****************************************************************************/
void Mch_ListOneOrMoreMatchesTimes (const struct Mch_Match *Match,unsigned UniqueId)
static void Mch_ListOneOrMoreMatchesTimes (const struct Gam_Games *Games,
const struct Mch_Match *Match,
unsigned UniqueId)
{
extern const char *Dat_TimeStatusClass[Dat_NUM_TIME_STATUS][HidVis_NUM_HIDDEN_VISIBLE];
Dat_StartEndTime_t StartEndTime;
char *Id;
static Dat_TimeStatus_t TimeStatus[Mch_NUM_SHOWING] =
{
[Mch_START ] = Dat_FUTURE, // Start: don't show anything
[Mch_STEM ] = Dat_PRESENT, // Showing only the question stem
[Mch_ANSWERS] = Dat_PRESENT, // Showing the question stem and the answers
[Mch_RESULTS] = Dat_PRESENT, // Showing the results
[Mch_END ] = Dat_PAST, // End: don't show anything
};
for (StartEndTime = (Dat_StartEndTime_t) 0;
StartEndTime <= (Dat_StartEndTime_t) (Dat_NUM_START_END_TIME - 1);
@ -599,8 +622,7 @@ void Mch_ListOneOrMoreMatchesTimes (const struct Mch_Match *Match,unsigned Uniqu
Err_NotEnoughMemoryExit ();
HTM_TD_Begin ("id=\"%s\" class=\"LT %s_%s %s\"",
Id,
Match->Status.Showing == Mch_END ? "DATE_RED" :
"DATE_GREEN",
Dat_TimeStatusClass[TimeStatus[Match->Status.Showing]][Games->Game.HiddenOrVisible],
The_GetSuffix (),
The_GetColorRows ());
Dat_WriteLocalDateHMSFromUTC (Id,Match->TimeUTC[StartEndTime],
@ -615,9 +637,11 @@ void Mch_ListOneOrMoreMatchesTimes (const struct Mch_Match *Match,unsigned Uniqu
/***************** Put a column for match title and grous ********************/
/*****************************************************************************/
static void Mch_ListOneOrMoreMatchesTitleGrps (const struct Mch_Match *Match,
static void Mch_ListOneOrMoreMatchesTitleGrps (const struct Gam_Games *Games,
const struct Mch_Match *Match,
const char *Anchor)
{
extern const char *HidVis_TitleClass[HidVis_NUM_HIDDEN_VISIBLE];
extern const char *Txt_Play;
extern const char *Txt_Resume;
@ -631,7 +655,8 @@ static void Mch_ListOneOrMoreMatchesTitleGrps (const struct Mch_Match *Match,
HTM_BUTTON_Submit_Begin (Gbl.Usrs.Me.Role.Logged == Rol_STD ? Txt_Play :
Txt_Resume,
"class=\"LT BT_LINK ASG_TITLE_%s\"",
"class=\"LT BT_LINK %s_%s\"",
HidVis_TitleClass[Games->Game.HiddenOrVisible],
The_GetSuffix ());
HTM_Txt (Match->Title);
HTM_BUTTON_End ();
@ -640,7 +665,7 @@ static void Mch_ListOneOrMoreMatchesTitleGrps (const struct Mch_Match *Match,
/***** Groups whose students can answer this match *****/
if (Gbl.Crs.Grps.NumGrps)
Mch_GetAndWriteNamesOfGrpsAssociatedToMatch (Match);
Mch_GetAndWriteNamesOfGrpsAssociatedToMatch (Games,Match);
HTM_ARTICLE_End ();
HTM_TD_End ();
@ -650,8 +675,10 @@ static void Mch_ListOneOrMoreMatchesTitleGrps (const struct Mch_Match *Match,
/************* Get and write the names of the groups of a match **************/
/*****************************************************************************/
static void Mch_GetAndWriteNamesOfGrpsAssociatedToMatch (const struct Mch_Match *Match)
static void Mch_GetAndWriteNamesOfGrpsAssociatedToMatch (const struct Gam_Games *Games,
const struct Mch_Match *Match)
{
extern const char *HidVis_GroupClass[HidVis_NUM_HIDDEN_VISIBLE];
extern const char *Txt_Group;
extern const char *Txt_Groups;
extern const char *Txt_and;
@ -664,7 +691,9 @@ static void Mch_GetAndWriteNamesOfGrpsAssociatedToMatch (const struct Mch_Match
/***** Get groups associated to a match from database *****/
NumGrps = Mch_DB_GetGrpNamesAssociatedToMatch (&mysql_res,Match->MchCod);
HTM_DIV_Begin ("class=\"ASG_GRP_%s\"",The_GetSuffix ());
HTM_DIV_Begin ("class=\"%s_%s\"",
HidVis_GroupClass[Games->Game.HiddenOrVisible],
The_GetSuffix ());
/***** Write heading *****/
HTM_TxtColonNBSP (NumGrps == 1 ? Txt_Group :
@ -708,11 +737,15 @@ static void Mch_GetAndWriteNamesOfGrpsAssociatedToMatch (const struct Mch_Match
/******************* Put a column for number of players **********************/
/*****************************************************************************/
void Mch_ListOneOrMoreMatchesNumPlayers (const struct Mch_Match *Match)
static void Mch_ListOneOrMoreMatchesNumPlayers (const struct Gam_Games *Games,
const struct Mch_Match *Match)
{
extern const char *HidVis_DataClass[HidVis_NUM_HIDDEN_VISIBLE];
/***** Number of players who have answered any question in the match ******/
HTM_TD_Begin ("class=\"RT DAT_%s %s\"",
The_GetSuffix (),The_GetColorRows ());
HTM_TD_Begin ("class=\"RT %s_%s %s\"",
HidVis_DataClass[Games->Game.HiddenOrVisible],The_GetSuffix (),
The_GetColorRows ());
HTM_Unsigned (Mch_DB_GetNumUsrsWhoHavePlayedMch (Match->MchCod));
HTM_TD_End ();
}
@ -721,15 +754,21 @@ void Mch_ListOneOrMoreMatchesNumPlayers (const struct Mch_Match *Match)
/********************** Put a column for match status ************************/
/*****************************************************************************/
static void Mch_ListOneOrMoreMatchesStatus (struct Mch_Match *Match,unsigned NumQsts)
static void Mch_ListOneOrMoreMatchesStatus (const struct Gam_Games *Games,
struct Mch_Match *Match,
unsigned NumQsts)
{
extern const char *HidVis_DataClass[HidVis_NUM_HIDDEN_VISIBLE];
HTM_TD_Begin ("class=\"CT DAT_%s %s\"",
The_GetSuffix (),The_GetColorRows ());
if (Match->Status.Showing != Mch_END) // Match not over
{
/* Current question index / total of questions */
HTM_DIV_Begin ("class=\"DAT_%s\"",The_GetSuffix ());
HTM_DIV_Begin ("class=\"%s_%s\"",
HidVis_DataClass[Games->Game.HiddenOrVisible],
The_GetSuffix ());
HTM_TxtF ("%u/%u",Match->Status.QstInd,NumQsts);
HTM_DIV_End ();
}
@ -771,8 +810,7 @@ static void Mch_ListOneOrMoreMatchesResult (struct Gam_Games *Games,
[Rol_SYS_ADM] = Mch_ListOneOrMoreMatchesResultTch,
};
HTM_TD_Begin ("class=\"CT DAT_%s %s\"",
The_GetSuffix (),The_GetColorRows ());
HTM_TD_Begin ("class=\"CT %s\"",The_GetColorRows ());
if (Function[Gbl.Usrs.Me.Role.Logged])
Function[Gbl.Usrs.Me.Role.Logged] (Games,Match);
@ -1284,11 +1322,7 @@ static void Mch_ShowLstGrpsToEditMatch (long MchCod)
{
/***** Begin box and table *****/
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RT FORM_IN_%s\"",The_GetSuffix ());
HTM_TxtColon (Txt_Groups);
HTM_TD_End ();
HTM_TD_TxtColon (Txt_Groups);
HTM_TD_Begin ("class=\"LT\"");
Box_BoxTableBegin ("95%",NULL,
@ -1327,7 +1361,6 @@ static void Mch_ShowLstGrpsToEditMatch (long MchCod)
Box_BoxTableEnd ();
HTM_TD_End ();
HTM_TR_End ();
}

3
swad_match.h
View File

@ -97,9 +97,6 @@ void Mch_ResetMatch (struct Mch_Match *Match);
void Mch_ListMatches (struct Gam_Games *Games,
bool PutFormNewMatch);
void Mch_GetMatchDataByCod (struct Mch_Match *Match);
void Mch_ListOneOrMoreMatchesAuthor (const struct Mch_Match *Match);
void Mch_ListOneOrMoreMatchesTimes (const struct Mch_Match *Match,unsigned UniqueId);
void Mch_ListOneOrMoreMatchesNumPlayers (const struct Mch_Match *Match);
void Mch_ToggleVisResultsMchUsr (void);

7
swad_message.c
View File

@ -332,11 +332,7 @@ static void Msg_PutFormMsgUsrs (struct Msg_Messages *Messages,
/***** "To:" section (recipients) *****/
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RT FORM_IN_%s\"",The_GetSuffix ());
HTM_TxtColon (Txt_MSG_To);
HTM_TD_End ();
HTM_TD_TxtColon (Txt_MSG_To);
HTM_TD_Begin ("class=\"LT\"");
if (Messages->ShowOnlyOneRecipient)
/***** Show only one user as recipient *****/
@ -355,7 +351,6 @@ static void Msg_PutFormMsgUsrs (struct Msg_Messages *Messages,
HTM_TABLE_End ();
}
HTM_TD_End ();
HTM_TR_End ();
/***** Subject and content sections *****/

4
swad_privacy.c
View File

@ -170,9 +170,7 @@ static void Pri_PutFormVisibility (const char *TxtLabel,
HTM_TR_Begin (NULL);
/***** Select visibility *****/
HTM_TD_Begin ("class=\"RT FORM_IN_%s\"",The_GetSuffix ());
HTM_TxtColon (TxtLabel);
HTM_TD_End ();
HTM_TD_TxtColon (TxtLabel);
/***** Form with list of options *****/
HTM_TD_Begin ("class=\"LT\"");

4
swad_project_config.c
View File

@ -187,9 +187,7 @@ static void PrjCfg_ShowFormsRubricsOfType (const struct Rub_Rubrics *Rubrics,
HTM_TR_Begin (NULL);
/* Label */
HTM_TD_Begin ("class=\"RT FORM_IN_%s\"",The_GetSuffix ());
HTM_TxtColon (Txt_PROJECT_RUBRIC[RubricType]);
HTM_TD_End ();
HTM_TD_TxtColon (Txt_PROJECT_RUBRIC[RubricType]);
/* Selectors of rubrics */
HTM_TD_Begin ("class=\"LT\"");

54
swad_question.c
View File

@ -205,9 +205,7 @@ void Qst_ShowFormAnswerTypes (const struct Qst_AnswerTypes *AnswerTypes)
HTM_TR_Begin (NULL);
/***** Label *****/
HTM_TD_Begin ("class=\"RT FORM_IN_%s\"",The_GetSuffix ());
HTM_TxtColon (Txt_Types_of_answers);
HTM_TD_End ();
HTM_TD_TxtColon (Txt_Types_of_answers);
/***** Select all types of answers *****/
HTM_TD_Begin ("class=\"LT\"");
@ -1862,11 +1860,7 @@ void Qst_PutFormEditOneQst (struct Qst_Question *Question)
/***** Write the tags *****/
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RT FORM_IN_%s\"",The_GetSuffix ());
HTM_TxtColon (Txt_Tags);
HTM_TD_End ();
HTM_TD_TxtColon (Txt_Tags);
HTM_TD_Begin ("class=\"LT\"");
HTM_TABLE_BeginPadding (2); // Table for tags
@ -1944,7 +1938,6 @@ void Qst_PutFormEditOneQst (struct Qst_Question *Question)
HTM_TABLE_End (); // Table for tags
HTM_TD_End ();
HTM_TR_End ();
/* Free structure that stores the query result */
@ -1986,39 +1979,29 @@ void Qst_PutFormEditOneQst (struct Qst_Question *Question)
/***** Type of answer *****/
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RT FORM_IN_%s\"",The_GetSuffix ());
HTM_TxtColon (Txt_Type);
HTM_TD_End ();
HTM_TD_TxtColon (Txt_Type);
HTM_TD_Begin ("class=\"LT FORM_IN_%s\"",The_GetSuffix ());
for (AnsType = (Qst_AnswerType_t) 0;
AnsType <= (Qst_AnswerType_t) (Qst_NUM_ANS_TYPES - 1);
AnsType++)
{
HTM_LABEL_Begin (NULL);
HTM_INPUT_RADIO ("AnswerType",HTM_DONT_SUBMIT_ON_CLICK,
"value=\"%u\"%s onclick=\"enableDisableAns(this.form);\"",
(unsigned) AnsType,
AnsType == Question->Answer.Type ? " checked=\"checked\"" :
"");
HTM_TxtF ("%s&nbsp;",Txt_TST_STR_ANSWER_TYPES[AnsType]);
HTM_LABEL_End ();
HTM_BR ();
}
for (AnsType = (Qst_AnswerType_t) 0;
AnsType <= (Qst_AnswerType_t) (Qst_NUM_ANS_TYPES - 1);
AnsType++)
{
HTM_LABEL_Begin (NULL);
HTM_INPUT_RADIO ("AnswerType",HTM_DONT_SUBMIT_ON_CLICK,
"value=\"%u\"%s onclick=\"enableDisableAns(this.form);\"",
(unsigned) AnsType,
AnsType == Question->Answer.Type ? " checked=\"checked\"" :
"");
HTM_TxtF ("%s&nbsp;",Txt_TST_STR_ANSWER_TYPES[AnsType]);
HTM_LABEL_End ();
HTM_BR ();
}
HTM_TD_End ();
HTM_TR_End ();
/***** Answers *****/
/* Integer answer */
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RT FORM_IN_%s\"",
The_GetSuffix ());
HTM_TxtColon (Txt_Answers);
HTM_TD_End ();
HTM_TD_TxtColon (Txt_Answers);
HTM_TD_Begin ("class=\"LT\"");
HTM_LABEL_Begin ("class=\"FORM_IN_%s\"",
The_GetSuffix ());
@ -2033,7 +2016,6 @@ void Qst_PutFormEditOneQst (struct Qst_Question *Question)
" disabled=\"disabled\"");
HTM_LABEL_End ();
HTM_TD_End ();
HTM_TR_End ();
/* Floating point answer */

3
swad_rubric.c
View File

@ -502,8 +502,7 @@ static void Rub_PutIconsToRemEditOneRubric (struct Rub_Rubrics *Rubrics)
static void Rub_WriteAuthor (const struct Rub_Rubric *Rubric)
{
Usr_WriteAuthor1Line (Rubric->UsrCod,
false); // Not hidden
Usr_WriteAuthor1Line (Rubric->UsrCod,HidVis_VISIBLE);
}
/*****************************************************************************/

8
swad_statistic.c
View File

@ -300,12 +300,7 @@ static void Sta_PutFormCrsHits (struct Sta_Stats *Stats)
HTM_TABLE_BeginCenterPadding (2);
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RT FORM_IN_%s\"",
The_GetSuffix ());
HTM_TxtColon (Txt_Users);
HTM_TD_End ();
HTM_TD_TxtColon (Txt_Users);
HTM_TD_Begin ("class=\"LT FORM_IN_%s\"",
The_GetSuffix ());
HTM_TABLE_Begin (NULL);
@ -314,7 +309,6 @@ static void Sta_PutFormCrsHits (struct Sta_Stats *Stats)
Usr_ListUsersToSelect (Rol_STD,&Gbl.Usrs.Selected);
HTM_TABLE_End ();
HTM_TD_End ();
HTM_TR_End ();
/***** Initial and final dates of the search *****/

34
swad_survey.c
View File

@ -1698,11 +1698,7 @@ void Svy_ReqCreatOrEditSvy (void)
/***** Users' roles who can answer the survey *****/
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RT FORM_IN_%s\"",The_GetSuffix ());
HTM_TxtColon (Txt_Users);
HTM_TD_End ();
HTM_TD_TxtColon (Txt_Users);
HTM_TD_Begin ("class=\"LM DAT_%s\"",The_GetSuffix ());
Rol_WriteSelectorRoles (1 << Rol_STD |
1 << Rol_NET |
@ -1710,7 +1706,6 @@ void Svy_ReqCreatOrEditSvy (void)
Surveys.Svy.Roles,
false,false);
HTM_TD_End ();
HTM_TR_End ();
/***** Groups *****/
@ -1823,11 +1818,7 @@ static void Svy_ShowLstGrpsToEditSurvey (long SvyCod)
{
/***** Begin box and table *****/
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RT FORM_IN_%s\"",The_GetSuffix ());
HTM_TxtColon (Txt_Groups);
HTM_TD_End ();
HTM_TD_TxtColon (Txt_Groups);
HTM_TD_Begin ("class=\"LT\"");
Box_BoxTableBegin ("95%",NULL,
NULL,NULL,
@ -2284,11 +2275,7 @@ static void Svy_ShowFormEditOneQst (struct Svy_Surveys *Surveys,
/***** Type of answer *****/
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RT FORM_IN_%s\"",The_GetSuffix ());
HTM_TxtColon (Txt_Type);
HTM_TD_End ();
HTM_TD_TxtColon (Txt_Type);
HTM_TD_Begin ("class=\"LT FORM_IN_%s\"",The_GetSuffix ());
for (AnsType = (Svy_AnswerType_t) 0;
AnsType <= (Svy_AnswerType_t) (Svy_NUM_ANS_TYPES - 1);
@ -2304,16 +2291,11 @@ static void Svy_ShowFormEditOneQst (struct Svy_Surveys *Surveys,
HTM_BR ();
}
HTM_TD_End ();
HTM_TR_End ();
/***** Answers *****/
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RT FORM_IN_%s\"",The_GetSuffix ());
HTM_TxtColon (Txt_Options);
HTM_TD_End ();
HTM_TD_TxtColon (Txt_Options);
HTM_TD_Begin ("class=\"LT\"");
/* Unique or multiple choice answers */
@ -2346,16 +2328,11 @@ static void Svy_ShowFormEditOneQst (struct Svy_Surveys *Surveys,
HTM_TABLE_End ();
HTM_TD_End ();
HTM_TR_End ();
/***** Comments allowed? *****/
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RT FORM_IN_%s\"",The_GetSuffix ());
HTM_TxtColon (Txt_Comments);
HTM_TD_End ();
HTM_TD_TxtColon (Txt_Comments);
HTM_TD_Begin ("class=\"LT FORM_IN_%s\"",The_GetSuffix ());
HTM_LABEL_Begin (NULL);
HTM_INPUT_CHECKBOX ("Comment",HTM_DONT_SUBMIT_ON_CHANGE,
@ -2365,7 +2342,6 @@ static void Svy_ShowFormEditOneQst (struct Svy_Surveys *Surveys,
HTM_Txt (Txt_Comments_allowed);
HTM_LABEL_End ();
HTM_TD_End ();
HTM_TR_End ();
/***** End table *****/

4
swad_tag.c
View File

@ -294,9 +294,7 @@ void Tag_ShowFormSelTags (const struct Tag_Tags *Tags,
HTM_TR_Begin (NULL);
/***** Label *****/
HTM_TD_Begin ("class=\"RT FORM_IN_%s\"",The_GetSuffix ());
HTM_TxtColon (Txt_Tags);
HTM_TD_End ();
HTM_TD_TxtColon (Txt_Tags);
/***** Select all tags *****/
HTM_TD_Begin ("class=\"LT\"");

24
swad_test_config.c
View File

@ -174,12 +174,7 @@ static void TstCfg_ShowFormConfig (void)
/***** Tests are visible from plugins? *****/
HTM_TABLE_BeginCenterPadding (2);
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RT FORM_IN_%s\"",
The_GetSuffix ());
HTM_TxtColon (Txt_Plugins);
HTM_TD_End ();
HTM_TD_TxtColon (Txt_Plugins);
HTM_TD_Begin ("class=\"LB\"");
for (Pluggable = TstCfg_PLUGGABLE_NO;
Pluggable <= TstCfg_PLUGGABLE_YES;
@ -197,17 +192,11 @@ static void TstCfg_ShowFormConfig (void)
HTM_BR ();
}
HTM_TD_End ();
HTM_TR_End ();
/***** Number of questions *****/
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RT FORM_IN_%s\"",
The_GetSuffix ());
HTM_TxtColon (Txt_Number_of_questions);
HTM_TD_End ();
HTM_TD_TxtColon (Txt_Number_of_questions);
HTM_TD_Begin ("class=\"LB\"");
HTM_TABLE_BeginPadding (2);
TstCfg_PutInputFieldNumQsts ("NumQstMin",Txt_minimum,
@ -218,7 +207,6 @@ static void TstCfg_ShowFormConfig (void)
TstCfg_GetConfigMax ()); // Maximum number of questions
HTM_TABLE_End ();
HTM_TD_End ();
HTM_TR_End ();
/***** Minimum time between consecutive tests, per question *****/
@ -244,16 +232,10 @@ static void TstCfg_ShowFormConfig (void)
/***** Visibility of test prints *****/
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RT FORM_IN_%s\"",
The_GetSuffix ());
HTM_TxtColon (Txt_Result_visibility);
HTM_TD_End ();
HTM_TD_TxtColon (Txt_Result_visibility);
HTM_TD_Begin ("class=\"LB\"");
TstVis_PutVisibilityCheckboxes (TstCfg_GetConfigVisibility ());
HTM_TD_End ();
HTM_TR_End ();
HTM_TABLE_End ();

8
swad_user.c
View File

@ -3757,12 +3757,7 @@ void Usr_PutFormToSelectUsrsToGoToAct (struct Usr_SelectedUsrs *SelectedUsrs,
/* Put list of users to select some of them */
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RT FORM_IN_%s\"",
The_GetSuffix ());
HTM_TxtColon (Txt_Users);
HTM_TD_End ();
HTM_TD_TxtColon (Txt_Users);
HTM_TD_Begin ("class=\"LT FORM_IN_%s\"",
The_GetSuffix ());
HTM_TABLE_BeginCenterPadding (2);
@ -3771,7 +3766,6 @@ void Usr_PutFormToSelectUsrsToGoToAct (struct Usr_SelectedUsrs *SelectedUsrs,
Usr_ListUsersToSelect (Rol_STD,SelectedUsrs);
HTM_TABLE_End ();
HTM_TD_End ();
HTM_TR_End ();
/* Starting and ending dates in the search */