Version 16.106.18

This commit is contained in:
Antonio Cañas Vargas 2016-12-25 22:01:43 +01:00
parent 2bf6a99240
commit 18eef5f630
2 changed files with 23 additions and 13 deletions

View File

@ -188,13 +188,14 @@
/****************************** Public constants *****************************/ /****************************** Public constants *****************************/
/*****************************************************************************/ /*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 16.106.17 (2016-12-25)" #define Log_PLATFORM_VERSION "SWAD 16.106.18 (2016-12-25)"
#define CSS_FILE "swad16.106.5.css" #define CSS_FILE "swad16.106.5.css"
#define JS_FILE "swad16.101.js" #define JS_FILE "swad16.101.js"
// Number of lines (includes comments but not blank lines) has been got with the following command: // Number of lines (includes comments but not blank lines) has been got with the following command:
// nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*?.h sql/swad*.sql | tail -1 // nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*?.h sql/swad*.sql | tail -1
/* /*
Version 16.106.18:Dec 25, 2016 Changes in behaviour of labels in forms. (211496 lines)
Version 16.106.17:Dec 25, 2016 Changes in behaviour of labels in forms. (211486 lines) Version 16.106.17:Dec 25, 2016 Changes in behaviour of labels in forms. (211486 lines)
Version 16.106.16:Dec 25, 2016 Changes in behaviour of labels in forms. (211473 lines) Version 16.106.16:Dec 25, 2016 Changes in behaviour of labels in forms. (211473 lines)
Version 16.106.15:Dec 25, 2016 Changes in behaviour of labels in forms. (211460 lines) Version 16.106.15:Dec 25, 2016 Changes in behaviour of labels in forms. (211460 lines)

View File

@ -2619,7 +2619,8 @@ static void Svy_ShowFormEditOneQst (long SvyCod,struct SurveyQuestion *SvyQst,ch
char Query[512]; char Query[512];
MYSQL_RES *mysql_res; MYSQL_RES *mysql_res;
MYSQL_ROW row; MYSQL_ROW row;
unsigned NumAns,NumAnswers = 0; unsigned NumAns;
unsigned NumAnswers = 0;
Svy_AnswerType_t AnsType; Svy_AnswerType_t AnsType;
if (Gbl.Action.Act == ActEdiOneSvyQst) // If no receiving the question, but editing a new or existing question if (Gbl.Action.Act == ActEdiOneSvyQst) // If no receiving the question, but editing a new or existing question
@ -2696,11 +2697,12 @@ static void Svy_ShowFormEditOneQst (long SvyCod,struct SurveyQuestion *SvyQst,ch
/***** Stem *****/ /***** Stem *****/
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s RIGHT_TOP\">" "<td class=\"RIGHT_TOP\">"
"%s:" "<label for=\"Txt\" class=\"%s\">%s:</label>"
"</td>" "</td>"
"<td class=\"LEFT_TOP\">" "<td class=\"LEFT_TOP\">"
"<textarea name=\"Txt\" cols=\"60\" rows=\"4\">" "<textarea id=\"Txt\" name=\"Txt\""
" cols=\"60\" rows=\"4\">"
"%s" "%s"
"</textarea>" "</textarea>"
"</td>" "</td>"
@ -2721,11 +2723,15 @@ static void Svy_ShowFormEditOneQst (long SvyCod,struct SurveyQuestion *SvyQst,ch
AnsType < Svy_NUM_ANS_TYPES; AnsType < Svy_NUM_ANS_TYPES;
AnsType++) AnsType++)
{ {
fprintf (Gbl.F.Out,"<input type=\"radio\" name=\"AnswerType\" value=\"%u\"", fprintf (Gbl.F.Out,"<label>"
"<input type=\"radio\" name=\"AnswerType\""
" value=\"%u\"",
(unsigned) AnsType); (unsigned) AnsType);
if (AnsType == SvyQst->AnswerType) if (AnsType == SvyQst->AnswerType)
fprintf (Gbl.F.Out," checked=\"checked\""); fprintf (Gbl.F.Out," checked=\"checked\"");
fprintf (Gbl.F.Out," />%s<br />", fprintf (Gbl.F.Out," />"
"%s"
"</label><br />",
Txt_SURVEY_STR_ANSWER_TYPES[AnsType]); Txt_SURVEY_STR_ANSWER_TYPES[AnsType]);
} }
fprintf (Gbl.F.Out,"</td>" fprintf (Gbl.F.Out,"</td>"
@ -2744,15 +2750,16 @@ static void Svy_ShowFormEditOneQst (long SvyCod,struct SurveyQuestion *SvyQst,ch
{ {
/* Label with the number of the answer */ /* Label with the number of the answer */
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s RIGHT_TOP\">" "<td class=\"RIGHT_TOP\">"
"%u)" "<label for=\"AnsStr%u\" class=\"%s\">%u)</label>"
"</td>", "</td>",
The_ClassForm[Gbl.Prefs.Theme],NumAns+1); NumAns,The_ClassForm[Gbl.Prefs.Theme],NumAns + 1);
/* Answer text */ /* Answer text */
fprintf (Gbl.F.Out,"<td class=\"RIGHT_TOP\">" fprintf (Gbl.F.Out,"<td class=\"RIGHT_TOP\">"
"<textarea name=\"AnsStr%u\" cols=\"50\" rows=\"1\">", "<textarea id=\"AnsStr%u\" name=\"AnsStr%u\""
NumAns); " cols=\"50\" rows=\"1\">",
NumAns,NumAns);
if (SvyQst->AnsChoice[NumAns].Text) if (SvyQst->AnsChoice[NumAns].Text)
fprintf (Gbl.F.Out,"%s",SvyQst->AnsChoice[NumAns].Text); fprintf (Gbl.F.Out,"%s",SvyQst->AnsChoice[NumAns].Text);
fprintf (Gbl.F.Out,"</textarea>" fprintf (Gbl.F.Out,"</textarea>"
@ -3445,7 +3452,9 @@ static void Svy_WriteAnswersOfAQst (struct Survey *Svy,struct SurveyQuestion *Sv
/* Write the number of option */ /* Write the number of option */
fprintf (Gbl.F.Out,"<td class=\"LEFT_TOP\" style=\"width:50px;\">" fprintf (Gbl.F.Out,"<td class=\"LEFT_TOP\" style=\"width:50px;\">"
"<label for=\"Ans%010u_%010u\" class=\"DAT\">%u)</label>" "<label for=\"Ans%010u_%010u\" class=\"DAT\">"
"%u)"
"</label>"
"</td>", "</td>",
(unsigned) SvyQst->QstCod,NumAns,NumAns + 1); (unsigned) SvyQst->QstCod,NumAns,NumAns + 1);