Marown/swad-core
Marown/swad-core
1
0
Fork 0
mirror of https://github.com/acanas/swad-core.git synced 2024-06-05 16:25:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Version 15.178.1

Browse Source
This commit is contained in:
Antonio Cañas Vargas 2016-04-04 22:23:54 +02:00
parent 0d9402c11f
commit 2d09d5767b
3 changed files with 21 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
css/swad15.175.10.css → css/swad15.178.1.css
View File

@ -1743,20 +1743,12 @@ a:hover img.CENTRE_PHOTO_SHOW
.TEST_EXA_LIGHT {color:#A0A0A0; font-size:12pt;}
.TEST_EDI {color:#404040; font-size:12pt;}
.TEST_EDI_LIGHT {color:#A0A0A0; font-size:12pt;}
.TEST_IMG_SHOW
{
width:600px;
margin:10px 0;
}
.TEST_IMG_EDIT_LIST
{
width:300px;
margin:5px 0;
}
.TEST_IMG_EDIT_ONE
{
width:600px;
}
.TEST_IMG_SHOW_STEM {width:600px; margin:10px 0;}
.TEST_IMG_SHOW_ANS {width:450px; margin:10px 0;}
.TEST_IMG_EDIT_LIST_STEM {width:300px; margin:5px 0;}
.TEST_IMG_EDIT_LIST_ANS {width:225px; margin:5px 0;}
.TEST_IMG_EDIT_ONE_STEM {width:600px;}
.TEST_IMG_EDIT_ONE_ANS {width:450px;}
/******************************* Time table **********************************/
#timetable

5
swad_changelog.h
View File

@ -134,13 +134,14 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 15.178 (2016-04-04)"
#define CSS_FILE "swad15.175.10.css"
#define Log_PLATFORM_VERSION "SWAD 15.178.1 (2016-04-04)"
#define CSS_FILE "swad15.178.1.css"
#define JS_FILE "swad15.131.3.js"
// 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
/*
Version 15.178.1: Apr 04, 2016 Changes in CSS related to images in test questions. (198240 lines)
Version 15.178: Apr 04, 2016 Code refactoring related to images in test questions. (198244 lines)
5 changes necessary in database:
ALTER TABLE tst_questions CHANGE COLUMN Image ImageOld CHAR(43) NOT NULL;

21
swad_test.c
View File

@ -155,7 +155,7 @@ static void Tst_ShowTestQuestionsWhenSeeing (MYSQL_RES *mysql_res);
static void Tst_ShowTstResultAfterAssess (long TstCod,unsigned *NumQstsNotBlank,double *TotalScore);
static void Tst_WriteQstAndAnsExam (unsigned NumQst,long QstCod,MYSQL_ROW row,
double *ScoreThisQst,bool *AnswerIsNotBlank);
static void Tst_PutFormToEditQstImage (struct Image *Image,
static void Tst_PutFormToEditQstImage (struct Image *Image,const char *ClassImg,
const char *ParamAction,
const char *ParamFile);
static void Tst_UpdateScoreQst (long QstCod,float ScoreThisQst,bool AnswerIsNotBlank);
@ -993,7 +993,7 @@ static void Tst_WriteQstAndAnsExam (unsigned NumQst,long QstCod,MYSQL_ROW row,
Gbl.Test.Image.Status = Img_NAME_STORED_IN_DB;
strncpy (Gbl.Test.Image.Name,row[5],Cry_LENGTH_ENCRYPTED_STR_SHA256_BASE64);
Gbl.Test.Image.Name[Cry_LENGTH_ENCRYPTED_STR_SHA256_BASE64] = '\0';
Img_ShowImage (&Gbl.Test.Image,"TEST_IMG_SHOW");
Img_ShowImage (&Gbl.Test.Image,"TEST_IMG_SHOW_STEM");
}
if (Gbl.Action.Act == ActSeeTst)
Tst_WriteAnswersOfAQstSeeExam (NumQst,QstCod,(Str_ConvertToUpperLetter (row[3][0]) == 'Y'));
@ -1039,7 +1039,7 @@ void Tst_WriteQstStem (const char *Stem,const char *ClassStem)
/************* Put form to upload a new image for a test question ************/
/*****************************************************************************/
static void Tst_PutFormToEditQstImage (struct Image *Image,
static void Tst_PutFormToEditQstImage (struct Image *Image,const char *ClassImg,
const char *ParamAction,
const char *ParamFile)
{
@ -1072,7 +1072,7 @@ static void Tst_PutFormToEditQstImage (struct Image *Image,
ParamAction,Img_ACTION_KEEP_IMAGE,
The_ClassForm[Gbl.Prefs.Theme],
Txt_Current_image);
Img_ShowImage (Image,"TEST_IMG_EDIT_ONE");
Img_ShowImage (Image,ClassImg);
}
/***** Change/new image *****/
@ -2745,7 +2745,7 @@ static void Tst_ListOneOrMoreQuestionsToEdit (unsigned long NumRows,MYSQL_RES *m
Gbl.Test.Image.Status = Img_NAME_STORED_IN_DB;
strncpy (Gbl.Test.Image.Name,row[5],Cry_LENGTH_ENCRYPTED_STR_SHA256_BASE64);
Gbl.Test.Image.Name[Cry_LENGTH_ENCRYPTED_STR_SHA256_BASE64] = '\0';
Img_ShowImage (&Gbl.Test.Image,"TEST_IMG_EDIT_LIST");
Img_ShowImage (&Gbl.Test.Image,"TEST_IMG_EDIT_LIST_STEM");
}
Tst_WriteQstFeedback (row[6],"TEST_EDI_LIGHT");
Tst_WriteAnswersOfAQstEdit (QstCod);
@ -2970,7 +2970,7 @@ static void Tst_WriteAnswersOfAQstEdit (long QstCod)
"%s",
Answer);
if (Gbl.Test.Answer.Options[NumOpt].Image.Name[0])
Img_ShowImage (&Gbl.Test.Answer.Options[NumOpt].Image,"TEST_IMG_EDIT_LIST");
Img_ShowImage (&Gbl.Test.Answer.Options[NumOpt].Image,"TEST_IMG_EDIT_LIST_ANS");
fprintf (Gbl.F.Out,"</div>");
/* Write the text of the feedback */
@ -3263,7 +3263,7 @@ static void Tst_WriteChoiceAnsSeeExam (unsigned NumQst,long QstCod,bool Shuffle)
"%s",
Gbl.Test.Answer.Options[NumOpt].Text);
if (Gbl.Test.Answer.Options[NumOpt].Image.Name[0])
Img_ShowImage (&Gbl.Test.Answer.Options[NumOpt].Image,"TEST_IMG_SHOW");
Img_ShowImage (&Gbl.Test.Answer.Options[NumOpt].Image,"TEST_IMG_SHOW_ANS");
fprintf (Gbl.F.Out,"</td>"
"</tr>");
}
@ -3437,7 +3437,7 @@ static void Tst_WriteChoiceAnsAssessExam (unsigned NumQst,MYSQL_RES *mysql_res,
"%s",
Gbl.Test.Answer.Options[Indexes[NumOpt]].Text);
if (Gbl.Test.Answer.Options[Indexes[NumOpt]].Image.Name[0])
Img_ShowImage (&Gbl.Test.Answer.Options[Indexes[NumOpt]].Image,"TEST_IMG_SHOW");
Img_ShowImage (&Gbl.Test.Answer.Options[Indexes[NumOpt]].Image,"TEST_IMG_SHOW_ANS");
fprintf (Gbl.F.Out,"</div>");
if (Gbl.Test.Config.FeedbackType == Tst_FEEDBACK_FULL_FEEDBACK)
if (Gbl.Test.Answer.Options[Indexes[NumOpt]].Feedback)
@ -4397,6 +4397,7 @@ static void Tst_PutFormEditOneQst (char *Stem,char *Feedback)
Txt_Stem,
Stem);
Tst_PutFormToEditQstImage (&Gbl.Test.Image,
"TEST_IMG_EDIT_ONE_STEM",
"ImgAct","FileImg");
fprintf (Gbl.F.Out,"</td>"
"</tr>");
@ -4600,7 +4601,9 @@ static void Tst_PutFormEditOneQst (char *Stem,char *Feedback)
"<td colspan=\"2\" class=\"LEFT_TOP\">");
sprintf (ParamAction,"ImgAct%u",NumOpt);
sprintf (ParamFile,"FileImg%u",NumOpt);
Tst_PutFormToEditQstImage (&Gbl.Test.Answer.Options[NumOpt].Image,ParamAction,ParamFile);
Tst_PutFormToEditQstImage (&Gbl.Test.Answer.Options[NumOpt].Image,
"TEST_IMG_EDIT_ONE_ANS",
ParamAction,ParamFile);
// if (OptionsDisabled)
// fprintf (Gbl.F.Out," disabled=\"disabled\"");
fprintf (Gbl.F.Out,"</td>"