Version 22.86.2: Mar 30, 2023 New links to manual about resource clipboard.

This commit is contained in:
acanas 2023-03-30 16:07:37 +02:00
parent 2bf309cf1b
commit 17e1059bbc
19 changed files with 106 additions and 43 deletions

View File

@ -1 +1 @@
<svg aria-hidden="true" focusable="false" data-prefix="fas" data-icon="clipboard-list" class="svg-inline--fa fa-clipboard-list fa-w-12" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 384 512"><path fill="currentColor" d="M336 64h-80c0-35.3-28.7-64-64-64s-64 28.7-64 64H48C21.5 64 0 85.5 0 112v352c0 26.5 21.5 48 48 48h288c26.5 0 48-21.5 48-48V112c0-26.5-21.5-48-48-48zM96 424c-13.3 0-24-10.7-24-24s10.7-24 24-24 24 10.7 24 24-10.7 24-24 24zm0-96c-13.3 0-24-10.7-24-24s10.7-24 24-24 24 10.7 24 24-10.7 24-24 24zm0-96c-13.3 0-24-10.7-24-24s10.7-24 24-24 24 10.7 24 24-10.7 24-24 24zm96-192c13.3 0 24 10.7 24 24s-10.7 24-24 24-24-10.7-24-24 10.7-24 24-24zm128 368c0 4.4-3.6 8-8 8H168c-4.4 0-8-3.6-8-8v-16c0-4.4 3.6-8 8-8h144c4.4 0 8 3.6 8 8v16zm0-96c0 4.4-3.6 8-8 8H168c-4.4 0-8-3.6-8-8v-16c0-4.4 3.6-8 8-8h144c4.4 0 8 3.6 8 8v16zm0-96c0 4.4-3.6 8-8 8H168c-4.4 0-8-3.6-8-8v-16c0-4.4 3.6-8 8-8h144c4.4 0 8 3.6 8 8v16z"></path></svg>
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 384 512"><!--! Font Awesome Pro 6.4.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2023 Fonticons, Inc. --><path d="M192 0c-41.8 0-77.4 26.7-90.5 64H64C28.7 64 0 92.7 0 128V448c0 35.3 28.7 64 64 64H320c35.3 0 64-28.7 64-64V128c0-35.3-28.7-64-64-64H282.5C269.4 26.7 233.8 0 192 0zm0 64a32 32 0 1 1 0 64 32 32 0 1 1 0-64zM72 272a24 24 0 1 1 48 0 24 24 0 1 1 -48 0zm104-16H304c8.8 0 16 7.2 16 16s-7.2 16-16 16H176c-8.8 0-16-7.2-16-16s7.2-16 16-16zM72 368a24 24 0 1 1 48 0 24 24 0 1 1 -48 0zm88 0c0-8.8 7.2-16 16-16H304c8.8 0 16 7.2 16 16s-7.2 16-16 16H176c-8.8 0-16-7.2-16-16z"/></svg>

Before

Width:  |  Height:  |  Size: 940 B

After

Width:  |  Height:  |  Size: 705 B

View File

@ -55,7 +55,7 @@ void AsgRsc_GetLinkToAssignment (void)
Assignments.CurrentPage = Pag_GetParPagNum (Pag_ASSIGNMENTS);
/***** Get assignment code *****/
Assignments.Asg.AsgCod = ParCod_GetAndCheckPar (ParCod_Asg);
Assignments.Asg.AsgCod = ParCod_GetPar (ParCod_Asg);
/***** Get assignment title *****/
AsgRsc_GetTitleFromAsgCod (Assignments.Asg.AsgCod,Title,sizeof (Title) - 1);

View File

@ -45,7 +45,7 @@ void AttRsc_GetLinkToEvent (void)
char Title[Att_MAX_BYTES_ATTENDANCE_EVENT_TITLE + 1];
/***** Get attendance event code *****/
AttCod = ParCod_GetAndCheckPar (ParCod_Att);
AttCod = ParCod_GetPar (ParCod_Att);
/***** Get attendance event title *****/
AttRsc_GetTitleFromAttCod (AttCod,Title,sizeof (Title) - 1);

View File

@ -56,7 +56,7 @@ void BrwRsc_GetLinkToFile (void)
Brw_GetParAndInitFileBrowser ();
/***** Get file code *****/
FilCod = ParCod_GetAndCheckPar (ParCod_Fil);
FilCod = ParCod_GetPar (ParCod_Fil);
/***** Get file title *****/
switch (Gbl.Action.Act)

View File

@ -46,7 +46,7 @@ void Cfe_GetLinkToCallForExam (void)
char Title[Cfe_MAX_BYTES_SESSION_AND_DATE];
/***** Get the code of the call for exam *****/
ExaCod = ParCod_GetAndCheckPar (ParCod_Exa);
ExaCod = ParCod_GetPar (ParCod_Exa);
/***** Get session and date of the exam *****/
CfeRsc_GetTitleFromExaCod (ExaCod,Title,sizeof (Title) - 1);

View File

@ -629,15 +629,26 @@ TODO: Emilce Barrera Mesa: Podr
TODO: Emilce Barrera Mesa: Mis estudiantes presentan muchas dificultades a la hora de poner la foto porque la plataforma es muy exigente respecto al fondo de la imagen.
*/
#define Log_PLATFORM_VERSION "SWAD 22.86.1 (2023-03-29)"
#define Log_PLATFORM_VERSION "SWAD 22.86.2 (2023-03-30)"
#define CSS_FILE "swad22.86.css"
#define JS_FILE "swad22.49.js"
/*
Version 22.86.2: Mar 30, 2023 New links to manual about resource clipboard.
Fixed bugs in links to resources. (338655 lines)
Version 22.86.1: Mar 29, 2023 Icon to remove resource clipboard only if there are resources. (338596 lines)
Version 22.86: Mar 29, 2023 New actions to see and remove the resource clipboard in rubrics. (338578 lines)
Version 22.85.1: Mar 29, 2023 Code refactoring in links to update sections. (338447 lines)
Version 22.85: Mar 29, 2023 New action to remove the resource clipboard in program. (338449 lines)
Version 22.84: Mar 29, 2023 New action to see the resource clipboard in program. (338356 lines)
Copy the following icons to icon public directory:
sudo cp -a icon/clipboard-user.svg /var/www/html/swad/icon/
sudo cp -a icon/clipboard.svg /var/www/html/swad/icon/
sudo cp -a icon/clipboard-check.svg /var/www/html/swad/icon/
sudo cp -a icon/clipboard-question.svg /var/www/html/swad/icon/
sudo cp -a icon/clipboard-list.svg /var/www/html/swad/icon/
sudo cp -a icon/paste.svg /var/www/html/swad/icon/
sudo cp -a icon/iconset/awesome/clipboard-list.svg /var/www/html/swad/icon/iconset/awesome/
Version 22.83.5: Mar 28, 2023 Fixed bugs in rubrics and exams. (338235 lines)
Version 22.83.4: Mar 28, 2023 Code refactoring in rubrics and exams. (338221 lines)
Version 22.83.3: Mar 27, 2023 Changes in rubric criteria. (338218 lines)

View File

@ -199,7 +199,7 @@ void Exa_SeeAllExams (void)
Exa_ResetExams (&Exams);
/***** Get parameters *****/
Exa_GetPars (&Exams,false); // Don't check exam code
Exa_GetPars (&Exams,Exa_DONT_CHECK_EXA_COD);
/***** Show all exams *****/
Exa_ListAllExams (&Exams);
@ -414,7 +414,7 @@ void Exa_SeeOneExam (void)
ExaSes_ResetSession (&Session);
/***** Get parameters *****/
Exa_GetPars (&Exams,true);
Exa_GetPars (&Exams,Exa_CHECK_EXA_COD);
/***** Get exam data *****/
Exa_GetExamDataByCod (&Exams.Exam);
@ -729,12 +729,12 @@ void Exa_PutPars (void *Exams)
/******************* Get parameters used to edit an exam **********************/
/*****************************************************************************/
void Exa_GetPars (struct Exa_Exams *Exams,bool CheckExaCod)
void Exa_GetPars (struct Exa_Exams *Exams,Exa_CheckExaCod_t CheckExaCod)
{
long (*GetExaCo[2]) (ParCod_Param_t ParCode) =
{
[false] = ParCod_GetPar,
[true ] = ParCod_GetAndCheckPar,
[Exa_DONT_CHECK_EXA_COD] = ParCod_GetPar,
[Exa_CHECK_EXA_COD ] = ParCod_GetAndCheckPar,
};
/***** Get other parameters *****/
@ -991,7 +991,7 @@ void Exa_AskRemExam (void)
Exa_ResetExam (&Exams.Exam);
/***** Get parameters *****/
Exa_GetPars (&Exams,true);
Exa_GetPars (&Exams,Exa_CHECK_EXA_COD);
/***** Get data of the exam from database *****/
Exa_GetExamDataByCod (&Exams.Exam);
@ -1213,7 +1213,7 @@ static void Exa_HideUnhideExam (bool Hide)
Exa_ResetExam (&Exams.Exam);
/***** Get parameters *****/
Exa_GetPars (&Exams,true);
Exa_GetPars (&Exams,Exa_CHECK_EXA_COD);
/***** Get data of the exam from database *****/
Exa_GetExamDataByCod (&Exams.Exam);
@ -1245,7 +1245,7 @@ void Exa_ReqCreatOrEditExam (void)
ExaSet_ResetSet (&Set);
/***** Get parameters *****/
Exa_GetPars (&Exams,false); // Don't check exam code
Exa_GetPars (&Exams,Exa_DONT_CHECK_EXA_COD);
ItsANewExam = (Exams.Exam.ExaCod <= 0);
/***** Get exam data *****/
@ -1418,7 +1418,7 @@ void Exa_ReceiveFormExam (void)
ExaSet_ResetSet (&Set);
/***** Get parameters *****/
Exa_GetPars (&Exams,false); // Don't check exam code
Exa_GetPars (&Exams,Exa_DONT_CHECK_EXA_COD);
ItsANewExam = (Exams.Exam.ExaCod <= 0);
/***** Get all current exam data from database *****/

View File

@ -52,7 +52,7 @@ void Exa_ShowOnlyOneExamEnd (void);
void Exa_SetCurrentExaCod (long ExaCod);
void Exa_PutPars (void *Exams);
void Exa_GetPars (struct Exa_Exams *Exams,bool CheckExaCod);
void Exa_GetPars (struct Exa_Exams *Exams,Exa_CheckExaCod_t CheckExaCod);
void Exa_GetListExams (struct Exa_Exams *Exams,Exa_Order_t SelectedOrder);
void Exa_GetListSelectedExaCods (struct Exa_Exams *Exams);

View File

@ -49,7 +49,7 @@ void ExaRsc_GetLinkToExam (void)
Exa_ResetExams (&Exams);
/***** Get parameters *****/
Exa_GetPars (&Exams,false);
Exa_GetPars (&Exams,Exa_DONT_CHECK_EXA_COD);
/***** Get exam title *****/
ExaRsc_GetTitleFromExaCod (Exams.Exam.ExaCod,Title,sizeof (Title) - 1);

View File

@ -195,7 +195,7 @@ void ExaRes_ShowMyResultsInExa (void)
ExaSes_ResetSession (&Session);
/***** Get parameters *****/
Exa_GetPars (&Exams,true);
Exa_GetPars (&Exams,Exa_CHECK_EXA_COD);
/***** Get exam data from database *****/
Exa_GetExamDataByCod (&Exams.Exam);
@ -243,7 +243,7 @@ void ExaRes_ShowMyResultsInSes (void)
ExaSes_ResetSession (&Session);
/***** Get parameters *****/
Exa_GetPars (&Exams,true);
Exa_GetPars (&Exams,Exa_CHECK_EXA_COD);
Session.SesCod = ParCod_GetAndCheckPar (ParCod_Ses);
Exa_GetExamDataByCod (&Exams.Exam);
ExaSes_GetSessionDataByCod (&Session);
@ -389,7 +389,7 @@ void ExaRes_ShowAllResultsInExa (void)
ExaSes_ResetSession (&Session);
/***** Get parameters *****/
Exa_GetPars (&Exams,true);
Exa_GetPars (&Exams,Exa_CHECK_EXA_COD);
Exa_GetExamDataByCod (&Exams.Exam);
/***** Exam begin *****/
@ -457,7 +457,7 @@ void ExaRes_ShowAllResultsInSes (void)
ExaSes_ResetSession (&Session);
/***** Get parameters *****/
Exa_GetPars (&Exams,true);
Exa_GetPars (&Exams,Exa_CHECK_EXA_COD);
Session.SesCod = ParCod_GetAndCheckPar (ParCod_Ses);
/***** Get exam data and session *****/

View File

@ -939,7 +939,7 @@ void ExaSes_GetAndCheckPars (struct Exa_Exams *Exams,
struct ExaSes_Session *Session)
{
/***** Get parameters *****/
Exa_GetPars (Exams,true);
Exa_GetPars (Exams,Exa_CHECK_EXA_COD);
Grp_GetParWhichGroups ();
Session->SesCod = ParCod_GetAndCheckPar (ParCod_Ses);
@ -1121,7 +1121,7 @@ void ExaSes_ReqCreatOrEditSes (void)
ExaSes_ResetSession (&Session);
/***** Get parameters *****/
Exa_GetPars (&Exams,true);
Exa_GetPars (&Exams,Exa_CHECK_EXA_COD);
Grp_GetParWhichGroups ();
Session.SesCod = ParCod_GetPar (ParCod_Ses);
ItsANewSession = (Session.SesCod <= 0);
@ -1167,7 +1167,7 @@ void ExaSes_ReceiveFormSession (void)
ExaSes_ResetSession (&Session);
/***** Get main parameters *****/
Exa_GetPars (&Exams,true);
Exa_GetPars (&Exams,Exa_CHECK_EXA_COD);
Grp_GetParWhichGroups ();
Session.SesCod = ParCod_GetPar (ParCod_Ses);
ItsANewSession = (Session.SesCod <= 0);

View File

@ -255,7 +255,7 @@ void ExaSet_ReceiveFormSet (void)
ExaSet_ResetSet (&Set);
/***** Get parameters *****/
Exa_GetPars (&Exams,true);
Exa_GetPars (&Exams,Exa_CHECK_EXA_COD);
Set.ExaCod = Exams.Exam.ExaCod;
/***** Get exam data from database *****/
@ -452,7 +452,7 @@ void ExaSet_ReqCreatOrEditSet (void)
ExaSet_ResetSet (&Set);
/***** Get parameters *****/
Exa_GetPars (&Exams,true);
Exa_GetPars (&Exams,Exa_CHECK_EXA_COD);
Exams.SetCod = Set.SetCod = ParCod_GetPar (ParCod_Set);
ItsANewSet = (Set.SetCod <= 0);
@ -1627,7 +1627,7 @@ static void ExaSet_GetAndCheckPars (struct Exa_Exams *Exams,
struct ExaSet_Set *Set)
{
/***** Get parameters *****/
Exa_GetPars (Exams,true);
Exa_GetPars (Exams,Exa_CHECK_EXA_COD);
Grp_GetParWhichGroups ();
Set->SetCod = ParCod_GetAndCheckPar (ParCod_Set);

View File

@ -56,6 +56,12 @@ typedef enum
} Exa_Order_t;
#define Exa_ORDER_DEFAULT Exa_ORDER_BY_START_DATE
typedef enum
{
Exa_DONT_CHECK_EXA_COD,
Exa_CHECK_EXA_COD,
} Exa_CheckExaCod_t;
struct Exa_ExamSelected
{
long ExaCod; // Exam code

View File

@ -1032,6 +1032,29 @@ const char *Hlp_COURSE_Program_edit_item =
"COURSE.Program.en#edit-item";
#endif
const char *Hlp_COURSE_Program_resource_clipboard =
#if L==1
"COURSE.Program.en#resource-clipboard";
#elif L==2
"COURSE.Program.en#resource-clipboard";
#elif L==3
"COURSE.Program.en#resource-clipboard";
#elif L==4
"COURSE.Program.es#portapapeles-de-recursos";
#elif L==5
"COURSE.Program.en#resource-clipboard";
#elif L==6
"COURSE.Program.es#portapapeles-de-recursos";
#elif L==7
"COURSE.Program.en#resource-clipboard";
#elif L==8
"COURSE.Program.en#resource-clipboard";
#elif L==9
"COURSE.Program.en#resource-clipboard";
#elif L==10 // tr
"COURSE.Program.en#resource-clipboard";
#endif
const char *Hlp_COURSE_Guide =
#if L==1
"COURSE.Guide.es";
@ -2116,6 +2139,29 @@ const char *Hlp_ASSESSMENT_Rubrics_criteria =
"ASSESSMENT.Rubrics.en#criteria";
#endif
const char *Hlp_ASSESSMENT_Rubrics_resource_clipboard =
#if L==1
"ASSESSMENT.Rubrics.es#resource-clipboard";
#elif L==2
"ASSESSMENT.Rubrics.en#resource-clipboard";
#elif L==3
"ASSESSMENT.Rubrics.en#resource-clipboard";
#elif L==4
"ASSESSMENT.Rubrics.es#portapapeles-de-recursos";
#elif L==5
"ASSESSMENT.Rubrics.en#resource-clipboard";
#elif L==6
"ASSESSMENT.Rubrics.es#portapapeles-de-recursos";
#elif L==7
"ASSESSMENT.Rubrics.en#resource-clipboard";
#elif L==8
"ASSESSMENT.Rubrics.en#resource-clipboard";
#elif L==9
"ASSESSMENT.Rubrics.en#resource-clipboard";
#elif L==10 // tr
"ASSESSMENT.Rubrics.en#resource-clipboard";
#endif
/***** FILES tab *****/
const char *Hlp_FILES_Documents =

View File

@ -854,12 +854,12 @@ void PrgRsc_ViewResourceClipboard (void)
static void PrgRsc_ShowClipboard (void)
{
extern const char *Hlp_COURSE_Program;
extern const char *Hlp_COURSE_Program_resource_clipboard;
extern const char *Txt_Resource_clipboard;
Box_BoxBegin (NULL,Txt_Resource_clipboard,
PrgRsc_PutIconsClipboard,NULL,
Hlp_COURSE_Program,Box_CLOSABLE);
Hlp_COURSE_Program_resource_clipboard,Box_CLOSABLE);
Rsc_ShowClipboard ();
Box_BoxEnd ();
}

View File

@ -51,7 +51,7 @@ void PrjRsc_GetLinkToProject (void)
/***** Get parameters *****/
Prj_GetPars (&Projects);
Projects.Prj.PrjCod = ParCod_GetAndCheckPar (ParCod_Prj);
Projects.Prj.PrjCod = ParCod_GetPar (ParCod_Prj);
/***** Get project title *****/
PrjRsc_GetTitleFromPrjCod (Projects.Prj.PrjCod,Title,sizeof (Title) - 1);

View File

@ -157,12 +157,12 @@ void RubRsc_ViewResourceClipboard (void)
static void RubRsc_ShowClipboard (void)
{
extern const char *Hlp_ASSESSMENT_Rubrics;
extern const char *Hlp_ASSESSMENT_Rubrics_resource_clipboard;
extern const char *Txt_Resource_clipboard;
Box_BoxBegin (NULL,Txt_Resource_clipboard,
RubRsc_PutIconsClipboard,NULL,
Hlp_ASSESSMENT_Rubrics,Box_CLOSABLE);
Hlp_ASSESSMENT_Rubrics_resource_clipboard,Box_CLOSABLE);
Rsc_ShowClipboard ();
Box_BoxEnd ();
}

View File

@ -49,7 +49,7 @@ void SvyRsc_GetLinkToSurvey (void)
Svy_ResetSurveys (&Surveys);
/***** Get survey code *****/
Surveys.Svy.SvyCod = ParCod_GetAndCheckPar (ParCod_Svy);
Surveys.Svy.SvyCod = ParCod_GetPar (ParCod_Svy);
/***** Get survey title *****/
SvyRsc_GetTitleFromSvyCod (Surveys.Svy.SvyCod,Title,sizeof (Title) - 1);

View File

@ -11817,25 +11817,25 @@ const char *Txt_Actions[ActLst_NUM_ACTIONS] =
,
[ActSeeExa] =
#if L==1 // ca
"See exams" // Necessita traducció
"Veure examen"
#elif L==2 // de
"See exams" // Need Übersetzung
"Siehe Pr&uuml;fung"
#elif L==3 // en
"See exams"
"See exam"
#elif L==4 // es
"Ver ex&aacute;menes"
"Ver examen"
#elif L==5 // fr
"See exams" // Besoin de traduction
"Voir examen"
#elif L==6 // gn
"Ver ex&aacute;menes" // Okoteve traducción
"Ehecha examen"
#elif L==7 // it
"See exams" // Bisogno di traduzione
"Vedi esame"
#elif L==8 // pl
"See exams" // Potrzebujesz tlumaczenie
"Zobacz egzamin"
#elif L==9 // pt
"See exams" // Precisa de tradução
"Ver exame"
#elif L==10 // tr
"See exams" // Çeviri lazim!
"S&inodot;nava bak&inodot;n"
#endif
,
[ActFrmNewExa] =