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

Version19.40.5

This commit is contained in:
Antonio Cañas Vargas 2019-10-22 22:39:37 +02:00
parent f3836e3f0d
commit 223907b7f4
6 changed files with 61 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
icon/th.svg
View File

@ -1 +1 @@
<svg aria-hidden="true" data-prefix="fas" data-icon="th" class="svg-inline--fa fa-th fa-w-16" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path fill="#404040" d="M149.333 56v80c0 13.255-10.745 24-24 24H24c-13.255 0-24-10.745-24-24V56c0-13.255 10.745-24 24-24h101.333c13.255 0 24 10.745 24 24zm181.334 240v-80c0-13.255-10.745-24-24-24H205.333c-13.255 0-24 10.745-24 24v80c0 13.255 10.745 24 24 24h101.333c13.256 0 24.001-10.745 24.001-24zm32-240v80c0 13.255 10.745 24 24 24H488c13.255 0 24-10.745 24-24V56c0-13.255-10.745-24-24-24H386.667c-13.255 0-24 10.745-24 24zm-32 80V56c0-13.255-10.745-24-24-24H205.333c-13.255 0-24 10.745-24 24v80c0 13.255 10.745 24 24 24h101.333c13.256 0 24.001-10.745 24.001-24zm-205.334 56H24c-13.255 0-24 10.745-24 24v80c0 13.255 10.745 24 24 24h101.333c13.255 0 24-10.745 24-24v-80c0-13.255-10.745-24-24-24zM0 376v80c0 13.255 10.745 24 24 24h101.333c13.255 0 24-10.745 24-24v-80c0-13.255-10.745-24-24-24H24c-13.255 0-24 10.745-24 24zm386.667-56H488c13.255 0 24-10.745 24-24v-80c0-13.255-10.745-24-24-24H386.667c-13.255 0-24 10.745-24 24v80c0 13.255 10.745 24 24 24zm0 160H488c13.255 0 24-10.745 24-24v-80c0-13.255-10.745-24-24-24H386.667c-13.255 0-24 10.745-24 24v80c0 13.255 10.745 24 24 24zM181.333 376v80c0 13.255 10.745 24 24 24h101.333c13.255 0 24-10.745 24-24v-80c0-13.255-10.745-24-24-24H205.333c-13.255 0-24 10.745-24 24z"></path></svg>
<svg aria-hidden="true" focusable="false" data-prefix="fas" data-icon="th" class="svg-inline--fa fa-th fa-w-16" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path fill="#404040" d="M149.333 56v80c0 13.255-10.745 24-24 24H24c-13.255 0-24-10.745-24-24V56c0-13.255 10.745-24 24-24h101.333c13.255 0 24 10.745 24 24zm181.334 240v-80c0-13.255-10.745-24-24-24H205.333c-13.255 0-24 10.745-24 24v80c0 13.255 10.745 24 24 24h101.333c13.256 0 24.001-10.745 24.001-24zm32-240v80c0 13.255 10.745 24 24 24H488c13.255 0 24-10.745 24-24V56c0-13.255-10.745-24-24-24H386.667c-13.255 0-24 10.745-24 24zm-32 80V56c0-13.255-10.745-24-24-24H205.333c-13.255 0-24 10.745-24 24v80c0 13.255 10.745 24 24 24h101.333c13.256 0 24.001-10.745 24.001-24zm-205.334 56H24c-13.255 0-24 10.745-24 24v80c0 13.255 10.745 24 24 24h101.333c13.255 0 24-10.745 24-24v-80c0-13.255-10.745-24-24-24zM0 376v80c0 13.255 10.745 24 24 24h101.333c13.255 0 24-10.745 24-24v-80c0-13.255-10.745-24-24-24H24c-13.255 0-24 10.745-24 24zm386.667-56H488c13.255 0 24-10.745 24-24v-80c0-13.255-10.745-24-24-24H386.667c-13.255 0-24 10.745-24 24v80c0 13.255 10.745 24 24 24zm0 160H488c13.255 0 24-10.745 24-24v-80c0-13.255-10.745-24-24-24H386.667c-13.255 0-24 10.745-24 24v80c0 13.255 10.745 24 24 24zM181.333 376v80c0 13.255 10.745 24 24 24h101.333c13.255 0 24-10.745 24-24v-80c0-13.255-10.745-24-24-24H205.333c-13.255 0-24 10.745-24 24z"></path></svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

11
swad_changelog.h
View File

@ -487,15 +487,22 @@ enscript -2 --landscape --color --file-align=2 --highlight --line-numbers -o - *
En OpenSWAD:
ps2pdf source.ps destination.pdf
*/
#define Log_PLATFORM_VERSION "SWAD 19.40.4 (2019-10-22)"
#define Log_PLATFORM_VERSION "SWAD 19.40.5 (2019-10-22)"
#define CSS_FILE "swad19.40.3.css"
#define JS_FILE "swad19.39.js"
/*
// TODO: Perico: poner un candado de bloqueo de creación/edición de proyectos (por ejemplo en asignaturas obsoletas)
// TODO: Hacer un nuevo rol en los TFG: tutor externo (profesor de áreas no vinculadas con el centro, profesionales de empresas, etc.)
// TODO: Change icon to upload file in timeline to photo-video.svg
Version 19.40.5: Oct 22, 2019 New icons to view match in two columns. (245882 lines)
Copy the following 3 icons to icon public directory:
sudo cp -a icon/bars.svg /var/www/html/swad/icon/
sudo cp -a icon/grip-vertical.svg /var/www/html/swad/icon/
sudo cp -a icon/th.svg /var/www/html/swad/icon/
Version 19.40.4: Oct 22, 2019 New icon to view results in matches. (245838 lines)
Copy the following 10 icons to icon public directory:
Copy the following icon to icon public directory:
sudo cp -a icon/poll-h.svg /var/www/html/swad/icon/
Version 19.40.3: Oct 21, 2019 Changes in score table. (245810 lines)

56
swad_match.c
View File

@ -77,6 +77,9 @@ const char *Mch_ShowingStringsDB[Mch_NUM_SHOWING] =
"results",
};
#define Mch_NUM_COLS 3
#define Mch_NUM_COLS_DEFAULT 1
/*****************************************************************************/
/***************************** Private variables *****************************/
/*****************************************************************************/
@ -156,7 +159,8 @@ static void Mch_ShowRightColumnStd (struct Match *Match);
static void Mch_ShowNumQstInMatch (struct Match *Match);
static void Mch_PutMatchControlButtons (struct Match *Match);
static void Mch_PutCheckboxResult (struct Match *Match);
static void Mch_ShowFormColumns (struct Match *Match);
// static void Mch_PutCheckboxResult (struct Match *Match);
static void Mch_ShowMatchTitle (struct Match *Match);
static void Mch_ShowFormViewResult (struct Match *Match);
static void Mch_ShowQuestionAndAnswersTch (struct Match *Match);
@ -338,6 +342,7 @@ void Mch_GetDataOfMatchByCod (struct Match *Match)
Match->Status.Showing = Mch_STEM;
Match->Status.Playing = false;
Match->Status.NumPlayers = 0;
Match->Status.NumCols = Mch_NUM_COLS_DEFAULT;
Match->Status.ShowQstResults = false;
Match->Status.ShowUsrResults = false;
}
@ -2065,6 +2070,7 @@ static void Mch_ShowLeftColumnTch (struct Match *Match)
/***** Put forms to choice which projects to show *****/
/* 1st. row */
Set_StartSettingsHead ();
Mch_ShowFormColumns (Match);
Mch_ShowFormViewResult (Match);
Set_EndSettingsHead ();
@ -2289,21 +2295,55 @@ static void Mch_PutMatchControlButtons (struct Match *Match)
}
/*****************************************************************************/
/***************** Put checkbox to select if show results ********************/
/** Show form to choice whether to show answers in one column or two columns */
/*****************************************************************************/
static void Mch_ShowFormColumns (struct Match *Match)
{
extern const char *Txt_columns;
unsigned NumCols;
static const char *NumColsIcon[Mch_NUM_COLS] =
{
"bars.svg", // 1 column
"grip-vertical.svg", // 2 columns
"th.svg", // 3 columns
};
Set_StartOneSettingSelector ();
for (NumCols = 0;
NumCols < Mch_NUM_COLS;
NumCols++)
{
fprintf (Gbl.F.Out,"<div class=\"%s\">",
(Match->Status.NumCols == NumCols) ? "PREF_ON" :
"PREF_OFF");
/***** Begin form *****/
Frm_StartForm (ActChgVisResMchQst);
Mch_PutParamMchCod (Match->MchCod); // Current match being played
Ico_PutSettingIconLink (NumColsIcon[NumCols],Txt_columns);
Frm_EndForm ();
fprintf (Gbl.F.Out,"</div>");
}
Set_EndOneSettingSelector ();
}
/*****************************************************************************/
/***************** Put checkbox to select if show results ********************/
/*****************************************************************************/
/*
static void Mch_PutCheckboxResult (struct Match *Match)
{
extern const char *Txt_View_results;
/***** Start container *****/
***** Start container *****
fprintf (Gbl.F.Out,"<div class=\"MCH_SHOW_RESULTS\">");
/***** Begin form *****/
***** Begin form *****
Frm_StartForm (ActChgVisResMchQst);
Mch_PutParamMchCod (Match->MchCod); // Current match being played
/***** Put icon with link *****/
***** Put icon with link *****
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_OPT\">"
"<a href=\"\" class=\"ICO_HIGHLIGHT\""
" title=\"%s\" "
@ -2319,13 +2359,13 @@ static void Mch_PutCheckboxResult (struct Match *Match)
"fas fa-toggle-off",
Txt_View_results);
/***** End form *****/
***** End form *****
Frm_EndForm ();
/***** End container *****/
***** End container *****
fprintf (Gbl.F.Out,"</div>");
}
*/
static void Mch_ShowFormViewResult (struct Match *Match)
{
extern const char *Txt_View_results;

1
swad_match.h
View File

@ -60,6 +60,7 @@ struct Match
long QstCod;
time_t QstStartTimeUTC;
Mch_Showing_t Showing; // What is shown on teacher's screen
unsigned NumCols; // Number of columns for answers on teacher's screen
bool ShowQstResults; // Show global results of current question while playing
bool ShowUsrResults; // Show exam with results of all questions for the student
bool Playing; // Is being played now?

2
swad_project.c
View File

@ -432,7 +432,7 @@ static void Prj_ShowFormToFilterByMy_All (void)
Gbl.Prjs.CurrentPage,
-1L);
Ico_PutSettingIconLink (WhoseProjectsIcon[My_All],
Txt_PROJECT_MY_ALL_PROJECTS[My_All]);
Txt_PROJECT_MY_ALL_PROJECTS[My_All]);
Frm_EndForm ();
fprintf (Gbl.F.Out,"</div>");
}

2
swad_project.h
View File

@ -36,7 +36,7 @@
/************************** Public types and constants ***********************/
/*****************************************************************************/
/***** Filters to list departments *****/
/***** Filters to list projects *****/
/* My projects / all projects */
#define Prj_NUM_WHOSE_PROJECTS 2
typedef enum