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 14.114

This commit is contained in:
Antonio Cañas Vargas 2015-06-15 12:30:09 +02:00
parent 6d2b7efc1b
commit b7fd6eced0
5 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
icon/bg1x1.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 77 B

7
swad_account.c
View File

@ -95,7 +95,14 @@ void Acc_ShowFormAccount (void)
if (Gbl.Usrs.Me.Logged) if (Gbl.Usrs.Me.Logged)
Acc_ShowFormChangeMyAccount (); Acc_ShowFormChangeMyAccount ();
else else
{
Acc_ShowFormRequestNewAccountWithParams ("",""); Acc_ShowFormRequestNewAccountWithParams ("","");
/***** Form to send students to be enrolled / removed *****/
Act_FormStart (ActEdiPrf);
Lay_EndRoundFrameWithButton (Lay_CONFIRM_BUTTON,"Change language");
Act_FormEnd ();
}
} }
/*****************************************************************************/ /*****************************************************************************/

4
swad_changelog.h
View File

@ -103,11 +103,13 @@
/****************************** Public constants *****************************/ /****************************** Public constants *****************************/
/*****************************************************************************/ /*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 14.113.4 (2015/04/25)" #define Log_PLATFORM_VERSION "SWAD 14.114 (2015/06/15)"
// 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 14.114: Jun 15, 2015 Fixed bug in tests query (some questions were repeated in exams). (184550 lines)
Version 14.113.5: Jun 01, 2015 Changes in sign up form. (184541 lines)
Version 14.113.4: Apr 25, 2015 Fixed bug in layout. (184537 lines) Version 14.113.4: Apr 25, 2015 Fixed bug in layout. (184537 lines)
Version 14.113.3: Apr 15, 2015 New welcome message after creating an account. (184536 lines) Version 14.113.3: Apr 15, 2015 New welcome message after creating an account. (184536 lines)
Version 14.113.2: Apr 14, 2015 Fixed bug when compressing users' works. (184486 lines) Version 14.113.2: Apr 14, 2015 Fixed bug when compressing users' works. (184486 lines)

2
swad_config.h
View File

@ -112,7 +112,7 @@
#define Cfg_AUTOMATIC_EMAIL_SMTP_PORT "465" // SMTP port for sending automatic e-mails #define Cfg_AUTOMATIC_EMAIL_SMTP_PORT "465" // SMTP port for sending automatic e-mails
#define Cfg_AUTOMATIC_EMAIL_FROM "acanas@openswad.org" // E-mail address from where automatic e-mails will be sent #define Cfg_AUTOMATIC_EMAIL_FROM "acanas@openswad.org" // E-mail address from where automatic e-mails will be sent
#define Cfg_DATABASE_HOST "localhost" // Database host #define Cfg_DATABASE_HOST "localhost" // Database host
#define Cfg_DEFAULT_LANGUAGE_FOR_NEW_USERS Txt_LANGUAGE_ES // Default language for new users #define Cfg_DEFAULT_LANGUAGE_FOR_NEW_USERS Txt_LANGUAGE_EN // Default language for new users
#define Cfg_LOG_START_YEAR 2012 // Year when the log started in the database #define Cfg_LOG_START_YEAR 2012 // Year when the log started in the database
// Footer of page with info about the institution where this platform is installed // Footer of page with info about the institution where this platform is installed

21
swad_test.c
View File

@ -2247,12 +2247,17 @@ static unsigned long Tst_GetQuestionsForExam (MYSQL_RES **mysql_res)
/* Start query */ /* Start query */
// Reject questions with any tag hidden // Reject questions with any tag hidden
// Select only questions with tags // Select only questions with tags
sprintf (Query,"SELECT tst_questions.QstCod,DATE_FORMAT(tst_questions.EditTime,'%%Y%%m%%d%%H%%i%%S')," sprintf (Query,"SELECT DISTINCTROW tst_questions.QstCod,"
"tst_questions.AnsType,tst_questions.Shuffle,tst_questions.Stem,tst_questions.Feedback," "DATE_FORMAT(tst_questions.EditTime,'%%Y%%m%%d%%H%%i%%S'),"
"tst_questions.NumHits,tst_questions.NumHitsNotBlank,tst_questions.Score" "tst_questions.AnsType,tst_questions.Shuffle,"
"tst_questions.Stem,tst_questions.Feedback,"
"tst_questions.NumHits,tst_questions.NumHitsNotBlank,"
"tst_questions.Score"
" FROM tst_questions,tst_question_tags,tst_tags" " FROM tst_questions,tst_question_tags,tst_tags"
" WHERE tst_questions.CrsCod='%ld' AND tst_questions.QstCod NOT IN" " WHERE tst_questions.CrsCod='%ld'"
" (SELECT tst_question_tags.QstCod FROM tst_tags,tst_question_tags" " AND tst_questions.QstCod NOT IN"
" (SELECT tst_question_tags.QstCod"
" FROM tst_tags,tst_question_tags"
" WHERE tst_tags.CrsCod='%ld' AND tst_tags.TagHidden='Y'" " WHERE tst_tags.CrsCod='%ld' AND tst_tags.TagHidden='Y'"
" AND tst_tags.TagCod=tst_question_tags.TagCod)" " AND tst_tags.TagCod=tst_question_tags.TagCod)"
" AND tst_questions.QstCod=tst_question_tags.QstCod" " AND tst_questions.QstCod=tst_question_tags.QstCod"
@ -2311,10 +2316,10 @@ static unsigned long Tst_GetQuestionsForExam (MYSQL_RES **mysql_res)
strcat (Query," ORDER BY RAND(NOW()) LIMIT "); strcat (Query," ORDER BY RAND(NOW()) LIMIT ");
sprintf (StrNumQsts,"%u",Gbl.Test.NumQsts); sprintf (StrNumQsts,"%u",Gbl.Test.NumQsts);
strcat (Query,StrNumQsts); strcat (Query,StrNumQsts);
/* /*
if (Gbl.Usrs.Me.LoggedRole == Rol_ROLE_SYS_ADM) if (Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM)
Lay_ShowAlert (Lay_INFO,Query); Lay_ShowAlert (Lay_INFO,Query);
*/ */
/* Make the query */ /* Make the query */
return DB_QuerySELECT (Query,mysql_res,"can not get questions"); return DB_QuerySELECT (Query,mysql_res,"can not get questions");
} }