mirror of https://github.com/acanas/swad-core.git
Version 14.127.3
This commit is contained in:
parent
39c57144ee
commit
e07f87181d
|
@ -403,7 +403,7 @@ hr.YELLOW_SEPARA {height:0; border-top:0; border-bottom:#BD4815 dotted 1px;}
|
|||
.CONTEXT_OPT
|
||||
{
|
||||
display:inline;
|
||||
margin:0 5px;
|
||||
margin-right:10px;
|
||||
}
|
||||
|
||||
/********************************* Frame 10 **********************************/
|
||||
|
@ -451,7 +451,7 @@ hr.YELLOW_SEPARA {height:0; border-top:0; border-bottom:#BD4815 dotted 1px;}
|
|||
.CELLS_PAD_4 td {padding:4px;}
|
||||
.CELLS_PAD_8 th {padding:8px;}
|
||||
.CELLS_PAD_8 td {padding:8px;}
|
||||
|
||||
|
||||
/*********************************** Title ***********************************/
|
||||
.TIT
|
||||
{
|
||||
|
@ -937,6 +937,15 @@ a:hover img.CENTRE_PHOTO_SHOW
|
|||
.DAT_N {color:#404040; font-size:11pt;}
|
||||
.DAT_NOBR_N {color:#404040; font-size:11pt; white-space:nowrap;}
|
||||
|
||||
/*********************** Line in top part of a table row *********************/
|
||||
.DAT_N_LINE_TOP
|
||||
{
|
||||
color:#404040;
|
||||
font-size:11pt;
|
||||
border-style:solid none none none;
|
||||
border-width:1px;
|
||||
}
|
||||
|
||||
.DAT_SMALL {font-family:"Arial Narrow", "Nimbus Sans L", "DejaVu LGC Sans Condensed", sans-serif; color:#707070; font-size:10pt;}
|
||||
.DAT_SMALL_LIGHT {font-family:"Arial Narrow", "Nimbus Sans L", "DejaVu LGC Sans Condensed", sans-serif; color:#A0A0A0; font-size:10pt;}
|
||||
.DAT_SMALL_NOBR {font-family:"Arial Narrow", "Nimbus Sans L", "DejaVu LGC Sans Condensed", sans-serif; color:#707070; font-size:10pt; white-space:nowrap;}
|
||||
|
|
|
@ -746,6 +746,15 @@ a:hover img.CENTRE_PHOTO_SHOW
|
|||
.DAT_N {color:#404040; font-size:16pt;}
|
||||
.DAT_NOBR_N {color:#404040; font-size:16pt; white-space:nowrap;}
|
||||
|
||||
/*********************** Line in top part of a table row *********************/
|
||||
.LINE_TOP
|
||||
{
|
||||
color:#404040;
|
||||
font-size:16pt;
|
||||
border-style:solid none none none;
|
||||
border-width:1px;
|
||||
}
|
||||
|
||||
.DAT_SMALL {font-Family:"Arial Narrow", "Nimbus Sans L", "DejaVu LGC Sans Condensed", sans-serif; color:#707070; font-size:14pt;}
|
||||
.DAT_SMALL_LIGHT {font-Family:"Arial Narrow", "Nimbus Sans L", "DejaVu LGC Sans Condensed", sans-serif; color:#A0A0A0; font-size:14pt;}
|
||||
.DAT_SMALL_NOBR {font-Family:"Arial Narrow", "Nimbus Sans L", "DejaVu LGC Sans Condensed", sans-serif; color:#707070; font-size:14pt; white-space:nowrap;}
|
||||
|
|
|
@ -297,7 +297,7 @@ static void Asg_ShowOneAssignment (long AsgCod)
|
|||
Txt_No);
|
||||
|
||||
/* Assignment folder */
|
||||
fprintf (Gbl.F.Out,"<td rowspan=\"2\" class=\"LEFT_TOP COLOR%u\">",
|
||||
fprintf (Gbl.F.Out,"<td rowspan=\"2\" class=\"DAT LEFT_TOP COLOR%u\">",
|
||||
Gbl.RowEvenOdd);
|
||||
Asg_WriteAssignmentFolder (&Asg);
|
||||
fprintf (Gbl.F.Out,"</td>"
|
||||
|
@ -407,9 +407,6 @@ static void Asg_WriteAssignmentFolder (struct Assignment *Asg)
|
|||
if (Asg->SendWork == Asg_SEND_WORK)
|
||||
{
|
||||
/***** Folder icon *****/
|
||||
fprintf (Gbl.F.Out,"<table style=\"border-spacing:2px;\">"
|
||||
"<tr>"
|
||||
"<td class=\"BT\">");
|
||||
if (Asg->Open &&
|
||||
Asg->ICanDo) // I can send files to this assignment folder
|
||||
{
|
||||
|
@ -433,11 +430,7 @@ static void Asg_WriteAssignmentFolder (struct Assignment *Asg)
|
|||
Txt_Folder,Txt_Folder);
|
||||
|
||||
/***** Folder name *****/
|
||||
fprintf (Gbl.F.Out,"</td>"
|
||||
"<td class=\"DAT LEFT_TOP\">%s</td>"
|
||||
"</tr>"
|
||||
"</table>",
|
||||
Asg->Folder);
|
||||
fprintf (Gbl.F.Out,"%s",Asg->Folder);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -499,7 +492,7 @@ static void Asg_PutFormsToRemEditOneAsg (long AsgCod,bool Hidden)
|
|||
extern const char *Txt_Hide;
|
||||
extern const char *Txt_Edit;
|
||||
|
||||
fprintf (Gbl.F.Out,"<div style=\"padding:5px 0;\">");
|
||||
fprintf (Gbl.F.Out,"<div>");
|
||||
|
||||
/***** Put form to remove assignment *****/
|
||||
Act_FormStart (ActReqRemAsg);
|
||||
|
|
|
@ -489,7 +489,7 @@ static void Att_PutFormsToRemEditOneAttEvent (long AttCod,bool Hidden)
|
|||
extern const char *Txt_Hide;
|
||||
extern const char *Txt_Edit;
|
||||
|
||||
fprintf (Gbl.F.Out,"<div style=\"padding:5px 0;\">");
|
||||
fprintf (Gbl.F.Out,"<div>");
|
||||
|
||||
/***** Put form to remove attendance event *****/
|
||||
Act_FormStart (ActReqRemAtt);
|
||||
|
@ -3047,9 +3047,7 @@ static void Att_ListStdsAttendanceTable (unsigned NumStdsInList,long *LstSelecte
|
|||
|
||||
/***** Last row with the total of students present in each event *****/
|
||||
fprintf (Gbl.F.Out,"<tr>"
|
||||
"<td colspan=\"%u\" class=\"DAT_N RIGHT_MIDDLE\""
|
||||
" style=\"border-style:solid none none none;"
|
||||
" border-width:1px;\">"
|
||||
"<td colspan=\"%u\" class=\"DAT_N_LINE_TOP RIGHT_MIDDLE\">"
|
||||
"%s:"
|
||||
"</td>",
|
||||
Gbl.Usrs.Listing.WithPhotos ? 4 :
|
||||
|
@ -3060,17 +3058,13 @@ static void Att_ListStdsAttendanceTable (unsigned NumStdsInList,long *LstSelecte
|
|||
NumAttEvent++)
|
||||
if (Gbl.AttEvents.Lst[NumAttEvent].Selected)
|
||||
{
|
||||
fprintf (Gbl.F.Out,"<td class=\"DAT_N CENTER_MIDDLE\""
|
||||
" style=\"border-style:solid none none none;"
|
||||
" border-width:1px;\">"
|
||||
fprintf (Gbl.F.Out,"<td class=\"DAT_N_LINE_TOP RIGHT_MIDDLE\">"
|
||||
"%u"
|
||||
"</td>",
|
||||
Gbl.AttEvents.Lst[NumAttEvent].NumStdsFromList);
|
||||
Total += Gbl.AttEvents.Lst[NumAttEvent].NumStdsFromList;
|
||||
}
|
||||
fprintf (Gbl.F.Out,"<td class=\"DAT_N RIGHT_MIDDLE\""
|
||||
" style=\"border-style:solid none none none;"
|
||||
" border-width:1px;\">"
|
||||
fprintf (Gbl.F.Out,"<td class=\"DAT_N_LINE_TOP RIGHT_MIDDLE\">"
|
||||
"%u"
|
||||
"</td>"
|
||||
"</tr>",
|
||||
|
|
|
@ -103,11 +103,12 @@
|
|||
/****************************** Public constants *****************************/
|
||||
/*****************************************************************************/
|
||||
|
||||
#define Log_PLATFORM_VERSION "SWAD 14.127.2 (2015/09/06)"
|
||||
#define Log_PLATFORM_VERSION "SWAD 14.127.3 (2015/09/06)"
|
||||
|
||||
// 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 14.127.3: Sep 06, 2015 Changes in styles. (184219 lines)
|
||||
Version 14.127.2: Sep 06, 2015 Changes in styles. (184244 lines)
|
||||
Version 14.127.1: Sep 06, 2015 Justify alignment is no longer used. (184259 lines)
|
||||
Version 14.127: Sep 05, 2015 Changes in styles. (184273 lines)
|
||||
|
|
|
@ -1211,19 +1211,13 @@ static void Ind_ShowTableOfCoursesWithIndicators (Ind_IndicatorsLayout_t Indicat
|
|||
NumCrss ? (float) NumCrssWithIndicatorYes[Ind] * 100.0 / (float) NumCrss :
|
||||
0.0);
|
||||
fprintf (Gbl.F.Out,"<tr>"
|
||||
"<td class=\"DAT_N RIGHT_MIDDLE\""
|
||||
" style=\"border-style:solid none none none;"
|
||||
" border-width:1px;\">"
|
||||
"<td class=\"DAT_N_LINE_TOP RIGHT_MIDDLE\">"
|
||||
"%s"
|
||||
"</td>"
|
||||
"<td class=\"DAT_N RIGHT_MIDDLE\""
|
||||
" style=\"border-style:solid none none none;"
|
||||
" border-width:1px;\">"
|
||||
"<td class=\"DAT_N_LINE_TOP RIGHT_MIDDLE\">"
|
||||
"%u"
|
||||
"</td>"
|
||||
"<td class=\"DAT_N RIGHT_MIDDLE\""
|
||||
" style=\"border-style:solid none none none;"
|
||||
" border-width:1px;\">"
|
||||
"<td class=\"DAT_N_LINE_TOP RIGHT_MIDDLE\">"
|
||||
"(%.1f%%)"
|
||||
"</td>"
|
||||
"</tr>"
|
||||
|
|
|
@ -985,7 +985,7 @@ void Lay_PutIconWithText (const char *Icon,const char *Alt,const char *Text)
|
|||
Alt,Text ? Text : Alt);
|
||||
if (Text)
|
||||
if (Text[0])
|
||||
fprintf (Gbl.F.Out," %s",
|
||||
fprintf (Gbl.F.Out," %s",
|
||||
Text);
|
||||
fprintf (Gbl.F.Out,"</div>"
|
||||
"</a>");
|
||||
|
|
164
swad_statistic.c
164
swad_statistic.c
|
@ -5045,11 +5045,8 @@ static void Sta_WriteRowStatsFileBrowsers (Brw_FileBrowser_t FileZone,const char
|
|||
char StrNumFilesPerCrs[10+1];
|
||||
char StrNumFilesPerUsr[10+1];
|
||||
struct Sta_SizeOfFileZones SizeOfFileZones;
|
||||
char *ClassData = (FileZone == Brw_UNKNOWN) ? "DAT_N" :
|
||||
"DAT";
|
||||
char *StyleTableCell = (FileZone == Brw_UNKNOWN) ? " border-style:solid none none none;"
|
||||
" border-width:1px;" :
|
||||
"";
|
||||
char *Class = (FileZone == Brw_UNKNOWN) ? "DAT_N_LINE_TOP" :
|
||||
"DAT";
|
||||
|
||||
Sta_GetSizeOfFileZoneFromDB (Gbl.Scope.Current,FileZone,&SizeOfFileZones);
|
||||
if (SizeOfFileZones.NumCrss == -1)
|
||||
|
@ -5095,48 +5092,48 @@ static void Sta_WriteRowStatsFileBrowsers (Brw_FileBrowser_t FileZone,const char
|
|||
0.0);
|
||||
}
|
||||
fprintf (Gbl.F.Out,"<tr>"
|
||||
"<td class=\"%s LEFT_MIDDLE\" style=\"%s\">"
|
||||
"<td class=\"%s LEFT_MIDDLE\">"
|
||||
"%s"
|
||||
"</td>"
|
||||
"<td class=\"%s RIGHT_MIDDLE\" style=\"%s\">"
|
||||
"<td class=\"%s RIGHT_MIDDLE\">"
|
||||
"%s"
|
||||
"</td>"
|
||||
"<td class=\"%s RIGHT_MIDDLE\" style=\"%s\">"
|
||||
"<td class=\"%s RIGHT_MIDDLE\">"
|
||||
"%s"
|
||||
"</td>"
|
||||
"<td class=\"%s RIGHT_MIDDLE\" style=\"%s\">"
|
||||
"<td class=\"%s RIGHT_MIDDLE\">"
|
||||
"%s"
|
||||
"</td>"
|
||||
"<td class=\"%s RIGHT_MIDDLE\" style=\"%s\">"
|
||||
"<td class=\"%s RIGHT_MIDDLE\">"
|
||||
"%u"
|
||||
"</td>"
|
||||
"<td class=\"%s RIGHT_MIDDLE\" style=\"%s\">"
|
||||
"<td class=\"%s RIGHT_MIDDLE\">"
|
||||
"%lu"
|
||||
"</td>"
|
||||
"<td class=\"%s RIGHT_MIDDLE\" style=\"%s\">"
|
||||
"<td class=\"%s RIGHT_MIDDLE\">"
|
||||
"%lu"
|
||||
"</td>"
|
||||
"<td class=\"%s RIGHT_MIDDLE\" style=\"%s\">",
|
||||
ClassData,StyleTableCell,NameOfFileZones,
|
||||
ClassData,StyleTableCell,StrNumCrss,
|
||||
ClassData,StyleTableCell,StrNumGrps,
|
||||
ClassData,StyleTableCell,StrNumUsrs,
|
||||
ClassData,StyleTableCell,SizeOfFileZones.MaxLevels,
|
||||
ClassData,StyleTableCell,SizeOfFileZones.NumFolders,
|
||||
ClassData,StyleTableCell,SizeOfFileZones.NumFiles,
|
||||
ClassData,StyleTableCell);
|
||||
"<td class=\"%s RIGHT_MIDDLE\">",
|
||||
Class,NameOfFileZones,
|
||||
Class,StrNumCrss,
|
||||
Class,StrNumGrps,
|
||||
Class,StrNumUsrs,
|
||||
Class,SizeOfFileZones.MaxLevels,
|
||||
Class,SizeOfFileZones.NumFolders,
|
||||
Class,SizeOfFileZones.NumFiles,
|
||||
Class);
|
||||
Str_WriteSizeInBytesFull ((double) SizeOfFileZones.Size);
|
||||
fprintf (Gbl.F.Out,"</td>"
|
||||
"<td class=\"%s RIGHT_MIDDLE\" style=\"%s\">"
|
||||
"<td class=\"%s RIGHT_MIDDLE\">"
|
||||
"%s"
|
||||
"</td>"
|
||||
"<td class=\"%s RIGHT_MIDDLE\" style=\"t%s\">"
|
||||
"<td class=\"%s RIGHT_MIDDLE\">"
|
||||
"%s"
|
||||
"</td>"
|
||||
"<td class=\"%s RIGHT_MIDDLE\" style=\"%s\">",
|
||||
ClassData,StyleTableCell,StrNumFoldersPerCrs,
|
||||
ClassData,StyleTableCell,StrNumFilesPerCrs,
|
||||
ClassData,StyleTableCell);
|
||||
"<td class=\"%s RIGHT_MIDDLE\">",
|
||||
Class,StrNumFoldersPerCrs,
|
||||
Class,StrNumFilesPerCrs,
|
||||
Class);
|
||||
if (SizeOfFileZones.NumCrss == -1)
|
||||
fprintf (Gbl.F.Out,"-");
|
||||
else
|
||||
|
@ -5144,16 +5141,16 @@ static void Sta_WriteRowStatsFileBrowsers (Brw_FileBrowser_t FileZone,const char
|
|||
(double) SizeOfFileZones.NumCrss :
|
||||
0.0);
|
||||
fprintf (Gbl.F.Out,"</td>"
|
||||
"<td class=\"%s RIGHT_MIDDLE\" style=\"%s\">"
|
||||
"<td class=\"%s RIGHT_MIDDLE\">"
|
||||
"%s"
|
||||
"</td>"
|
||||
"<td class=\"%s RIGHT_MIDDLE\" style=\"%s\">"
|
||||
"<td class=\"%s RIGHT_MIDDLE\">"
|
||||
"%s"
|
||||
"</td>"
|
||||
"<td class=\"%s RIGHT_MIDDLE\" style=\"%s\">",
|
||||
ClassData,StyleTableCell,StrNumFoldersPerUsr,
|
||||
ClassData,StyleTableCell,StrNumFilesPerUsr,
|
||||
ClassData,StyleTableCell);
|
||||
"<td class=\"%s RIGHT_MIDDLE\">",
|
||||
Class,StrNumFoldersPerUsr,
|
||||
Class,StrNumFilesPerUsr,
|
||||
Class);
|
||||
if (SizeOfFileZones.NumUsrs == -1)
|
||||
fprintf (Gbl.F.Out,"-");
|
||||
else
|
||||
|
@ -6022,8 +6019,6 @@ static void Sta_GetAndShowTestsStats (void)
|
|||
extern const char *Txt_Total;
|
||||
Tst_AnswerType_t AnsType;
|
||||
struct Tst_Stats Stats;
|
||||
char *StyleTableCell = " border-style:solid none none none;"
|
||||
" border-width:1px;";
|
||||
|
||||
/***** Table start *****/
|
||||
Lay_StartRoundFrameTable (NULL,2,Txt_STAT_USE_STAT_TYPES[Sta_TESTS]);
|
||||
|
@ -6126,46 +6121,46 @@ static void Sta_GetAndShowTestsStats (void)
|
|||
|
||||
/***** Write number of assignments *****/
|
||||
fprintf (Gbl.F.Out,"<tr>"
|
||||
"<td class=\"DAT_N LEFT_MIDDLE\" style=\"%s\">"
|
||||
"<td class=\"DAT_N_LINE_TOP LEFT_MIDDLE\">"
|
||||
"%s"
|
||||
"</td>"
|
||||
"<td class=\"DAT_N RIGHT_MIDDLE\" style=\"%s\">"
|
||||
"<td class=\"DAT_N_LINE_TOP RIGHT_MIDDLE\">"
|
||||
"%u"
|
||||
"</td>"
|
||||
"<td class=\"DAT_N RIGHT_MIDDLE\" style=\"%s\">"
|
||||
"<td class=\"DAT_N_LINE_TOP RIGHT_MIDDLE\">"
|
||||
"%u (%.1f%%)"
|
||||
"</td>"
|
||||
"<td class=\"DAT_N RIGHT_MIDDLE\" style=\"%s\">"
|
||||
"<td class=\"DAT_N_LINE_TOP RIGHT_MIDDLE\">"
|
||||
"%u"
|
||||
"</td>"
|
||||
"<td class=\"DAT_N RIGHT_MIDDLE\" style=\"%s\">"
|
||||
"<td class=\"DAT_N_LINE_TOP RIGHT_MIDDLE\">"
|
||||
"%.2f"
|
||||
"</td>"
|
||||
"<td class=\"DAT_N RIGHT_MIDDLE\" style=\"%s\">"
|
||||
"<td class=\"DAT_N_LINE_TOP RIGHT_MIDDLE\">"
|
||||
"%lu"
|
||||
"</td>"
|
||||
"<td class=\"DAT_N RIGHT_MIDDLE\" style=\"%s\">"
|
||||
"<td class=\"DAT_N_LINE_TOP RIGHT_MIDDLE\">"
|
||||
"%.2f"
|
||||
"</td>"
|
||||
"<td class=\"DAT_N RIGHT_MIDDLE\" style=\"%s\">"
|
||||
"<td class=\"DAT_N_LINE_TOP RIGHT_MIDDLE\">"
|
||||
"%.2f"
|
||||
"</td>"
|
||||
"<td class=\"DAT_N RIGHT_MIDDLE\" style=\"%s\">"
|
||||
"<td class=\"DAT_N_LINE_TOP RIGHT_MIDDLE\">"
|
||||
"%.2f"
|
||||
"</td>"
|
||||
"</tr>",
|
||||
StyleTableCell,Txt_Total,
|
||||
StyleTableCell,Stats.NumCoursesWithQuestions,
|
||||
StyleTableCell,Stats.NumCoursesWithPluggableQuestions,
|
||||
Txt_Total,
|
||||
Stats.NumCoursesWithQuestions,
|
||||
Stats.NumCoursesWithPluggableQuestions,
|
||||
Stats.NumCoursesWithQuestions ? (float) Stats.NumCoursesWithPluggableQuestions * 100.0 /
|
||||
(float) Stats.NumCoursesWithQuestions :
|
||||
0.0,
|
||||
StyleTableCell,Stats.NumQsts,
|
||||
StyleTableCell,Stats.AvgQstsPerCourse,
|
||||
StyleTableCell,Stats.NumHits,
|
||||
StyleTableCell,Stats.AvgHitsPerCourse,
|
||||
StyleTableCell,Stats.AvgHitsPerQuestion,
|
||||
StyleTableCell,Stats.AvgScorePerQuestion);
|
||||
Stats.NumQsts,
|
||||
Stats.AvgQstsPerCourse,
|
||||
Stats.NumHits,
|
||||
Stats.AvgHitsPerCourse,
|
||||
Stats.AvgHitsPerQuestion,
|
||||
Stats.AvgScorePerQuestion);
|
||||
|
||||
/***** End table *****/
|
||||
Lay_EndRoundFrameTable ();
|
||||
|
@ -6196,8 +6191,6 @@ static void Sta_GetAndShowNumUsrsPerNotifyEvent (void)
|
|||
unsigned NumEvents[Ntf_NUM_NOTIFY_EVENTS];
|
||||
unsigned NumMailsTotal = 0;
|
||||
unsigned NumMails[Ntf_NUM_NOTIFY_EVENTS];
|
||||
char *StyleTableCell = " border-style:solid none none none;"
|
||||
" border-width:1px;";
|
||||
|
||||
Lay_StartRoundFrameTable (NULL,2,Txt_STAT_USE_STAT_TYPES[Sta_NOTIFY_EVENTS]);
|
||||
|
||||
|
@ -6473,29 +6466,29 @@ static void Sta_GetAndShowNumUsrsPerNotifyEvent (void)
|
|||
|
||||
/***** Write total number of users who want to be notified by e-mail on some event *****/
|
||||
fprintf (Gbl.F.Out,"<tr>"
|
||||
"<td class=\"DAT_N LEFT_MIDDLE\" style=\"%s\">"
|
||||
"<td class=\"DAT_N_LINE_TOP LEFT_MIDDLE\">"
|
||||
"%s"
|
||||
"</td>"
|
||||
"<td class=\"DAT_N RIGHT_MIDDLE\" style=\"%s\">"
|
||||
"<td class=\"DAT_N_LINE_TOP RIGHT_MIDDLE\">"
|
||||
"%u"
|
||||
"</td>"
|
||||
"<td class=\"DAT_N RIGHT_MIDDLE\" style=\"%s\">"
|
||||
"<td class=\"DAT_N_LINE_TOP RIGHT_MIDDLE\">"
|
||||
"%5.2f%%"
|
||||
"</td>"
|
||||
"<td class=\"DAT_N RIGHT_MIDDLE\" style=\"%s\">"
|
||||
"<td class=\"DAT_N_LINE_TOP RIGHT_MIDDLE\">"
|
||||
"%u"
|
||||
"</td>"
|
||||
"<td class=\"DAT_N RIGHT_MIDDLE\" style=\"%s\">"
|
||||
"<td class=\"DAT_N_LINE_TOP RIGHT_MIDDLE\">"
|
||||
"%u"
|
||||
"</td>"
|
||||
"</tr>",
|
||||
StyleTableCell,Txt_Total,
|
||||
StyleTableCell,NumUsrsTotalWhoWantToBeNotifiedByEMailAboutSomeEvent,
|
||||
StyleTableCell,NumUsrsTotalInPlatform ? (float) NumUsrsTotalWhoWantToBeNotifiedByEMailAboutSomeEvent * 100.0 /
|
||||
(float) NumUsrsTotalInPlatform :
|
||||
0.0,
|
||||
StyleTableCell,NumEventsTotal,
|
||||
StyleTableCell,NumMailsTotal);
|
||||
Txt_Total,
|
||||
NumUsrsTotalWhoWantToBeNotifiedByEMailAboutSomeEvent,
|
||||
NumUsrsTotalInPlatform ? (float) NumUsrsTotalWhoWantToBeNotifiedByEMailAboutSomeEvent * 100.0 /
|
||||
(float) NumUsrsTotalInPlatform :
|
||||
0.0,
|
||||
NumEventsTotal,
|
||||
NumMailsTotal);
|
||||
|
||||
Lay_EndRoundFrameTable ();
|
||||
}
|
||||
|
@ -6993,8 +6986,6 @@ static void Sta_WriteForumTotalStats (struct Sta_StatsForum *StatsForum)
|
|||
float NumThrsPerForum;
|
||||
float NumPostsPerThread;
|
||||
float NumPostsPerForum;
|
||||
char *StyleTableCell = " border-style:solid none none none;"
|
||||
" border-width:1px;";
|
||||
|
||||
/***** Compute number of threads per forum, number of posts per forum and number of posts per thread *****/
|
||||
NumThrsPerForum = (StatsForum->NumForums ? (float) StatsForum->NumThreads / (float) StatsForum->NumForums :
|
||||
|
@ -7006,42 +6997,41 @@ static void Sta_WriteForumTotalStats (struct Sta_StatsForum *StatsForum)
|
|||
|
||||
/***** Write forum name and stats *****/
|
||||
fprintf (Gbl.F.Out,"<tr>"
|
||||
"<td style=\"width:16px; %s\">"
|
||||
"<td class=\"DAT_N_LINE_TOP\" style=\"width:16px;\">"
|
||||
"</td>"
|
||||
"<td class=\"DAT_N LEFT_TOP\" style=\"%s\">"
|
||||
"<td class=\"DAT_N_LINE_TOP LEFT_MIDDLE\">"
|
||||
"%s"
|
||||
"</td>"
|
||||
"<td class=\"DAT_N RIGHT_TOP\" style=\"%s\">"
|
||||
"<td class=\"DAT_N_LINE_TOP RIGHT_MIDDLE\">"
|
||||
"%u"
|
||||
"</td>"
|
||||
"<td class=\"DAT_N RIGHT_TOP\" style=\"%s\">"
|
||||
"<td class=\"DAT_N_LINE_TOP RIGHT_MIDDLE\">"
|
||||
"%u"
|
||||
"</td>"
|
||||
"<td class=\"DAT_N RIGHT_TOP\" style=\"%s\">"
|
||||
"<td class=\"DAT_N_LINE_TOP RIGHT_MIDDLE\">"
|
||||
"%u"
|
||||
"</td>"
|
||||
"<td class=\"DAT_N RIGHT_TOP\" style=\"%s\">"
|
||||
"<td class=\"DAT_N_LINE_TOP RIGHT_MIDDLE\">"
|
||||
"%u"
|
||||
"</td>"
|
||||
"<td class=\"DAT_N RIGHT_TOP\" style=\"%s\">"
|
||||
"<td class=\"DAT_N_LINE_TOP RIGHT_MIDDLE\">"
|
||||
"%.2f"
|
||||
"</td>"
|
||||
"<td class=\"DAT_N RIGHT_TOP\" style=\"%s\">"
|
||||
"<td class=\"DAT_N_LINE_TOP RIGHT_MIDDLE\">"
|
||||
"%.2f"
|
||||
"</td>"
|
||||
"<td class=\"DAT_N RIGHT_TOP\" style=\"%s\">"
|
||||
"<td class=\"DAT_N_LINE_TOP RIGHT_MIDDLE\">"
|
||||
"%.2f"
|
||||
"</td>"
|
||||
"</tr>",
|
||||
StyleTableCell,
|
||||
StyleTableCell,Txt_Total,
|
||||
StyleTableCell,StatsForum->NumForums,
|
||||
StyleTableCell,StatsForum->NumThreads,
|
||||
StyleTableCell,StatsForum->NumPosts,
|
||||
StyleTableCell,StatsForum->NumUsrsToBeNotifiedByEMail,
|
||||
StyleTableCell,NumThrsPerForum,
|
||||
StyleTableCell,NumPostsPerThread,
|
||||
StyleTableCell,NumPostsPerForum);
|
||||
Txt_Total,
|
||||
StatsForum->NumForums,
|
||||
StatsForum->NumThreads,
|
||||
StatsForum->NumPosts,
|
||||
StatsForum->NumUsrsToBeNotifiedByEMail,
|
||||
NumThrsPerForum,
|
||||
NumPostsPerThread,
|
||||
NumPostsPerForum);
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
|
|
|
@ -728,7 +728,7 @@ static void Svy_PutFormsToRemEditOneSvy (long SvyCod,bool Visible)
|
|||
extern const char *Txt_Hide;
|
||||
extern const char *Txt_Edit;
|
||||
|
||||
fprintf (Gbl.F.Out,"<div style=\"padding:5px 0;\">");
|
||||
fprintf (Gbl.F.Out,"<div>");
|
||||
|
||||
/***** Put form to remove survey *****/
|
||||
Act_FormStart (ActReqRemSvy);
|
||||
|
|
26
swad_test.c
26
swad_test.c
|
@ -6309,45 +6309,35 @@ static void Tst_ShowResultsOfTestExams (struct UsrData *UsrDat)
|
|||
Gbl.Test.Config.FeedbackType != Tst_FEEDBACK_NOTHING);
|
||||
|
||||
fprintf (Gbl.F.Out,"<tr>"
|
||||
"<td class=\"DAT_N RIGHT_TOP COLOR%u\""
|
||||
" style=\"border-style:solid none none none;"
|
||||
" border-width:1px;\">"
|
||||
"<td class=\"DAT_N_LINE_TOP RIGHT_MIDDLE COLOR%u\">"
|
||||
"%s: %u"
|
||||
"</td>",
|
||||
Gbl.RowEvenOdd,
|
||||
Txt_Visible_exams,NumExamsVisibleByTchs);
|
||||
|
||||
/* Write total number of questions */
|
||||
fprintf (Gbl.F.Out,"<td class=\"DAT_N RIGHT_TOP COLOR%u\""
|
||||
" style=\"border-style:solid none none none;"
|
||||
" border-width:1px;\">",
|
||||
fprintf (Gbl.F.Out,"<td class=\"DAT_N_LINE_TOP RIGHT_MIDDLE COLOR%u\">",
|
||||
Gbl.RowEvenOdd);
|
||||
if (NumExamsVisibleByTchs)
|
||||
fprintf (Gbl.F.Out,"%u",NumTotalQsts);
|
||||
fprintf (Gbl.F.Out,"</td>");
|
||||
|
||||
/* Write total number of questions not blank */
|
||||
fprintf (Gbl.F.Out,"<td class=\"DAT_N RIGHT_TOP COLOR%u\""
|
||||
" style=\"order-style:solid none none none;"
|
||||
" border-width:1px;\">",
|
||||
fprintf (Gbl.F.Out,"<td class=\"DAT_N_LINE_TOP RIGHT_MIDDLE COLOR%u\">",
|
||||
Gbl.RowEvenOdd);
|
||||
if (NumExamsVisibleByTchs)
|
||||
fprintf (Gbl.F.Out,"%u",NumTotalQstsNotBlank);
|
||||
fprintf (Gbl.F.Out,"</td>");
|
||||
|
||||
/* Write total score */
|
||||
fprintf (Gbl.F.Out,"<td class=\"DAT_N RIGHT_TOP COLOR%u\""
|
||||
" style=\"border-style:solid none none none;"
|
||||
" border-width:1px;\">",
|
||||
fprintf (Gbl.F.Out,"<td class=\"DAT_N_LINE_TOP RIGHT_MIDDLE COLOR%u\">",
|
||||
Gbl.RowEvenOdd);
|
||||
if (ICanViewScore)
|
||||
fprintf (Gbl.F.Out,"%.2lf",TotalScoreOfAllExams);
|
||||
fprintf (Gbl.F.Out,"</td>");
|
||||
|
||||
/* Write average score per question */
|
||||
fprintf (Gbl.F.Out,"<td class=\"DAT_N RIGHT_TOP COLOR%u\""
|
||||
" style=\"border-style:solid none none none;"
|
||||
" border-width:1px;\">",
|
||||
fprintf (Gbl.F.Out,"<td class=\"DAT_N_LINE_TOP RIGHT_MIDDLE COLOR%u\">",
|
||||
Gbl.RowEvenOdd);
|
||||
if (ICanViewScore)
|
||||
fprintf (Gbl.F.Out,"%.2lf",
|
||||
|
@ -6356,9 +6346,7 @@ static void Tst_ShowResultsOfTestExams (struct UsrData *UsrDat)
|
|||
fprintf (Gbl.F.Out,"</td>");
|
||||
|
||||
/* Write score over Tst_SCORE_MAX */
|
||||
fprintf (Gbl.F.Out,"<td class=\"DAT_N RIGHT_TOP COLOR%u\""
|
||||
" style=\"border-style:solid none none none;"
|
||||
" border-width:1px;\">",
|
||||
fprintf (Gbl.F.Out,"<td class=\"DAT_N_LINE_TOP RIGHT_MIDDLE COLOR%u\">",
|
||||
Gbl.RowEvenOdd);
|
||||
if (ICanViewScore)
|
||||
fprintf (Gbl.F.Out,"%.2lf",
|
||||
|
@ -6367,7 +6355,7 @@ static void Tst_ShowResultsOfTestExams (struct UsrData *UsrDat)
|
|||
fprintf (Gbl.F.Out,"</td>");
|
||||
|
||||
/* Last cell */
|
||||
fprintf (Gbl.F.Out,"<td class=\"COLOR%u\"></td>"
|
||||
fprintf (Gbl.F.Out,"<td class=\"DAT_N_LINE_TOP COLOR%u\"></td>"
|
||||
"</tr>",
|
||||
Gbl.RowEvenOdd);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue