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 15.219.1

This commit is contained in:
Antonio Cañas Vargas 2016-06-05 01:01:18 +02:00
parent c3f51e0f98
commit 8bb9d7aeec
3 changed files with 35 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
swad_changelog.h
View File

@ -125,18 +125,20 @@
// TODO: Messages in msg_content_deleted older than a certain time should be deleted to ensure the protection of personal data
// TODO: Request confirmation to remove user's photo
// TODO: FIX BUG: A teacher uploads a document in course documents zone, then he/she unregister from course, then he/she search for his/her documents, a document is shown in results but he/she can not view it
// TODO: Highlight row with number of indicators selected in blue background, as part of the form, instead of current field to select number of indicators
/*****************************************************************************/
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 15.219 (2016-06-04)"
#define Log_PLATFORM_VERSION "SWAD 15.219.1 (2016-06-05)"
#define CSS_FILE "swad15.218.css"
#define JS_FILE "swad15.216.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.219.1: Jun 05, 2016 Highlighted row with number of indicators selected. (202023 lines)
Version 15.219: Jun 04, 2016 Changes in listing of indicators of courses. (202001 lines)
Version 15.218.5: Jun 04, 2016 Fix bug in social notes, reported by Raymon Moreno Colina. (201940 lines)
2 changes necessary in database:

3
swad_course.c
View File

@ -486,8 +486,7 @@ static void Crs_WriteListMyCoursesToSelectOne (void)
/***** Table start *****/
Lay_StartRoundFrame (NULL,Txt_My_courses,NULL);
fprintf (Gbl.F.Out,"<div class=\"CENTER_MIDDLE\""
" style=\"display:inline-block;\">"
fprintf (Gbl.F.Out,"<div class=\"CENTER_MIDDLE\">"
"<ul class=\"LIST_LEFT\">");
/***** Write link to platform *****/

40
swad_indicator.c
View File

@ -566,10 +566,15 @@ static void Ind_ShowNumCoursesWithIndicators (unsigned NumCrssWithIndicatorYes[1
extern const char *Txt_Courses;
extern const char *Txt_Total;
unsigned Ind;
const char *Class;
const char *ClassNormal = "DAT RIGHT_MIDDLE";
const char *ClassHighlight = "DAT_N RIGHT_MIDDLE LIGHT_BLUE";
const char *ClassTotalNormal = "DAT_N_LINE_TOP RIGHT_MIDDLE";
const char *ClassTotalHighlight = "DAT_N_LINE_TOP RIGHT_MIDDLE LIGHT_BLUE";
/***** Write number of courses with each number of indicators valid *****/
fprintf (Gbl.F.Out,"<table class=\"CELLS_PAD_2\""
" style=\"margin:0 auto;\">"
" style=\"padding:10px; margin:0 auto;\">"
"<tr>"
"<th class=\"RIGHT_MIDDLE\">"
"%s"
@ -583,33 +588,50 @@ static void Ind_ShowNumCoursesWithIndicators (unsigned NumCrssWithIndicatorYes[1
for (Ind = 0;
Ind <= Ind_NUM_INDICATORS;
Ind++)
{
Class = (Ind == Gbl.Stat.NumIndicators) ? ClassHighlight :
ClassNormal;
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"DAT RIGHT_MIDDLE\">"
"<td class=\"%s\">"
"%u"
"</td>"
"<td class=\"DAT RIGHT_MIDDLE\">"
"<td class=\"%s\">"
"%u"
"</td>"
"<td class=\"DAT RIGHT_MIDDLE\">"
"<td class=\"%s\">"
"(%.1f%%)"
"</td>"
"</tr>",
Ind,NumCrssWithIndicatorYes[Ind],
Class,
Ind,
Class,
NumCrssWithIndicatorYes[Ind],
Class,
NumCrss ? (float) NumCrssWithIndicatorYes[Ind] * 100.0 / (float) NumCrss :
0.0);
}
/***** Write total of courses *****/
Class = (Gbl.Stat.NumIndicators < 0) ? ClassTotalHighlight :
ClassTotalNormal;
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"DAT_N_LINE_TOP RIGHT_MIDDLE\">"
"<td class=\"%s\">"
"%s"
"</td>"
"<td class=\"DAT_N_LINE_TOP RIGHT_MIDDLE\">"
"<td class=\"%s\">"
"%u"
"</td>"
"<td class=\"DAT_N_LINE_TOP RIGHT_MIDDLE\">"
"<td class=\"%s\">"
"(%.1f%%)"
"</td>"
"</tr>"
"</table>",
Txt_Total,NumCrss,100.0);
Class,
Txt_Total,
Class,
NumCrss,
Class,
100.0);
}
/*****************************************************************************/