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 21.91.3: Apr 05, 2022 Changes in syllabus.

This commit is contained in:
acanas 2022-04-05 20:47:19 +02:00
parent e1c94b1c84
commit 22c7189253
4 changed files with 66 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
swad_changelog.h
View File

@ -606,10 +606,11 @@ TODO: Fix bug: error al enviar un mensaje a dos recipientes, error on duplicate
TODO: Attach pdf files in multimedia. TODO: Attach pdf files in multimedia.
*/ */
#define Log_PLATFORM_VERSION "SWAD 21.91.2 (2022-04-05)" #define Log_PLATFORM_VERSION "SWAD 21.91.3 (2022-04-05)"
#define CSS_FILE "swad21.91.2.css" #define CSS_FILE "swad21.91.2.css"
#define JS_FILE "swad21.78.2.js" #define JS_FILE "swad21.78.2.js"
/* /*
Version 21.91.3: Apr 05, 2022 Changes in syllabus. (323227 lines)
Version 21.91.2: Apr 05, 2022 Working on design of dark theme. (323232 lines) Version 21.91.2: Apr 05, 2022 Working on design of dark theme. (323232 lines)
Version 21.91.1: Apr 05, 2022 Working on design of dark theme. (323232 lines) Version 21.91.1: Apr 05, 2022 Working on design of dark theme. (323232 lines)
Version 21.91: Apr 05, 2022 Working on design of dark theme. (323235 lines) Version 21.91: Apr 05, 2022 Working on design of dark theme. (323235 lines)

10
swad_info.c
View File

@ -311,16 +311,6 @@ void Inf_ShowInfo (void)
Gbl.Crs.Info.Type, Gbl.Crs.Info.Type,
&FromDB); &FromDB);
switch (Gbl.Crs.Info.Type)
{
case Inf_LECTURES:
case Inf_PRACTICALS:
Syl_PutFormWhichSyllabus (Syllabus.WhichSyllabus);
break;
default:
break;
}
switch (Gbl.Usrs.Me.Role.Logged) switch (Gbl.Usrs.Me.Role.Logged)
{ {
case Rol_STD: case Rol_STD:

87
swad_syllabus.c
View File

@ -160,14 +160,14 @@ void Syl_PutFormWhichSyllabus (Syl_WhichSyllabus_t SyllabusSelected)
/***** Form to select which syllabus I want to see (lectures/practicals) *****/ /***** Form to select which syllabus I want to see (lectures/practicals) *****/
Frm_BeginForm (ActSeeSyl); Frm_BeginForm (ActSeeSyl);
HTM_DIV_Begin ("class=\"CM\""); HTM_DIV_Begin ("class=\"SEL_BELOW_TITLE DAT_%s\"",The_GetSuffix ());
HTM_UL_Begin ("class=\"LIST_LEFT\""); HTM_UL_Begin (NULL);
for (WhichSyl = (Syl_WhichSyllabus_t) 0; for (WhichSyl = (Syl_WhichSyllabus_t) 0;
WhichSyl <= (Syl_WhichSyllabus_t) (For_NUM_FORUM_SETS - 1); WhichSyl <= (Syl_WhichSyllabus_t) (For_NUM_FORUM_SETS - 1);
WhichSyl++) WhichSyl++)
{ {
HTM_LI_Begin ("class=\"LM DAT_%s\"",The_GetSuffix ()); HTM_LI_Begin (NULL);
HTM_LABEL_Begin (NULL); HTM_LABEL_Begin (NULL);
HTM_INPUT_RADIO ("WhichSyllabus",true, HTM_INPUT_RADIO ("WhichSyllabus",true,
"value=\"%u\"%s", "value=\"%u\"%s",
@ -526,54 +526,59 @@ static void Syl_ShowSyllabus (struct Syl_Syllabus *Syllabus)
Gbl.Usrs.Me.Role.Logged == Rol_SYS_ADM; Gbl.Usrs.Me.Role.Logged == Rol_SYS_ADM;
bool PutIconToEdit = ICanEdit && !Syllabus->EditionIsActive; bool PutIconToEdit = ICanEdit && !Syllabus->EditionIsActive;
/***** Begin box and table *****/ /***** Begin box *****/
if (PutIconToEdit) if (PutIconToEdit)
Box_BoxTableBegin (NULL,Txt_INFO_TITLE[Gbl.Crs.Info.Type], Box_BoxBegin (NULL,Txt_INFO_TITLE[Gbl.Crs.Info.Type],
Inf_PutIconToEditInfo,&Gbl.Crs.Info.Type, Inf_PutIconToEditInfo,&Gbl.Crs.Info.Type,
Syllabus->EditionIsActive ? Hlp_COURSE_Syllabus_edit : Syllabus->EditionIsActive ? Hlp_COURSE_Syllabus_edit :
Hlp_COURSE_Syllabus, Hlp_COURSE_Syllabus,
Box_NOT_CLOSABLE,0); Box_NOT_CLOSABLE);
else else
Box_BoxTableBegin (NULL,Txt_INFO_TITLE[Gbl.Crs.Info.Type], Box_BoxBegin (NULL,Txt_INFO_TITLE[Gbl.Crs.Info.Type],
NULL,NULL, NULL,NULL,
Syllabus->EditionIsActive ? Hlp_COURSE_Syllabus_edit : Syllabus->EditionIsActive ? Hlp_COURSE_Syllabus_edit :
Hlp_COURSE_Syllabus, Hlp_COURSE_Syllabus,
Box_NOT_CLOSABLE,0); Box_NOT_CLOSABLE);
/***** Set width of columns of the table *****/ Syl_PutFormWhichSyllabus (Syllabus->WhichSyllabus);
HTM_Txt ("<colgroup>");
for (i = 0;
i < NumButtons;
i++)
HTM_Txt ("<col width=\"12\" />");
for (i = 1;
i <= Syl_LstItemsSyllabus.NumLevels;
i++)
HTM_TxtF ("<col width=\"%d\" />",i * Syl_WIDTH_NUM_SYLLABUS);
HTM_Txt ("<col width=\"*\" />");
HTM_Txt ("</colgroup>");
if (Syl_LstItemsSyllabus.NumItems) /***** Begin table *****/
/***** Loop writing all items of the syllabus *****/ HTM_TABLE_BeginWide ();
for (NumItem = 0;
NumItem < Syl_LstItemsSyllabus.NumItems; /***** Set width of columns of the table *****/
NumItem++) HTM_Txt ("<colgroup>");
{ for (i = 0;
Syl_ShowRowSyllabus (Syllabus,NumItem, i < NumButtons;
Syl_LstItemsSyllabus.Lst[NumItem].Level, i++)
Syl_LstItemsSyllabus.Lst[NumItem].CodItem, HTM_Txt ("<col width=\"12\" />");
Syl_LstItemsSyllabus.Lst[NumItem].Text,false); for (i = 1;
if (ShowRowInsertNewItem && NumItem == Syllabus->NumItem) i <= Syl_LstItemsSyllabus.NumLevels;
// Mostrar a new row where se puede insert a new item i++)
Syl_ShowRowSyllabus (Syllabus,NumItem + 1, HTM_TxtF ("<col width=\"%d\" />",i * Syl_WIDTH_NUM_SYLLABUS);
Syl_LstItemsSyllabus.Lst[NumItem].Level,NULL, HTM_Txt ("<col width=\"*\" />");
"",true); HTM_Txt ("</colgroup>");
}
else if (Syllabus->EditionIsActive) if (Syl_LstItemsSyllabus.NumItems)
/***** If the syllabus is empty ==> /***** Loop writing all items of the syllabus *****/
show form to add a iten to the end *****/ for (NumItem = 0;
Syl_ShowRowSyllabus (Syllabus,0, NumItem < Syl_LstItemsSyllabus.NumItems;
1,Syl_LstItemsSyllabus.Lst[0].CodItem,"",true); NumItem++)
{
Syl_ShowRowSyllabus (Syllabus,NumItem,
Syl_LstItemsSyllabus.Lst[NumItem].Level,
Syl_LstItemsSyllabus.Lst[NumItem].CodItem,
Syl_LstItemsSyllabus.Lst[NumItem].Text,false);
if (ShowRowInsertNewItem && NumItem == Syllabus->NumItem)
// Mostrar a new row where se puede insert a new item
Syl_ShowRowSyllabus (Syllabus,NumItem + 1,
Syl_LstItemsSyllabus.Lst[NumItem].Level,NULL,
"",true);
}
else if (Syllabus->EditionIsActive)
/***** If the syllabus is empty ==>
show form to add a iten to the end *****/
Syl_ShowRowSyllabus (Syllabus,0,
1,Syl_LstItemsSyllabus.Lst[0].CodItem,"",true);
/***** End table *****/ /***** End table *****/
HTM_TABLE_End (); HTM_TABLE_End ();

36
swad_text.c
View File

@ -16824,44 +16824,44 @@ const char *Txt_INFO_TITLE[Inf_NUM_TYPES] =
, ,
[Inf_LECTURES] = [Inf_LECTURES] =
#if L==1 // ca #if L==1 // ca
"Temari teoria" "Temari"
#elif L==2 // de #elif L==2 // de
"Studienplan (Vorlesungen)" "Studienplan"
#elif L==3 // en #elif L==3 // en
"Topics (lectures)" "Topics"
#elif L==4 // es #elif L==4 // es
"Temario teor&iacute;a" "Temario"
#elif L==5 // fr #elif L==5 // fr
"Plan th&eacute;orie" "Plan"
#elif L==6 // gn #elif L==6 // gn
"Temario teor&iacute;a" // Okoteve traducción "Temario" // Okoteve traducción
#elif L==7 // it #elif L==7 // it
"Temi teoria" "Temi"
#elif L==8 // pl #elif L==8 // pl
"Sylabus (wyklady)" "Sylabus"
#elif L==9 // pt #elif L==9 // pt
"Conte&uacute;do teoria" "Conte&uacute;do"
#endif #endif
, ,
[Inf_PRACTICALS] = [Inf_PRACTICALS] =
#if L==1 // ca #if L==1 // ca
"Temari pr&agrave;ctiques" "Temari"
#elif L==2 // de #elif L==2 // de
"Studienplan (&Uuml;bungen)" "Studienplan"
#elif L==3 // en #elif L==3 // en
"Topics (practicals)" "Topics"
#elif L==4 // es #elif L==4 // es
"Temario pr&aacute;cticas" "Temario"
#elif L==5 // fr #elif L==5 // fr
"Temi pratique" "Plan"
#elif L==6 // gn #elif L==6 // gn
"Temario pr&aacute;cticas" // Okoteve traducción "Temario" // Okoteve traducción
#elif L==7 // it #elif L==7 // it
"Programma pratica" "Temi"
#elif L==8 // pl #elif L==8 // pl
"Sylabus (practicals)" "Sylabus"
#elif L==9 // pt #elif L==9 // pt
"Conte&uacute;do pr&aacute;tica" "Conte&uacute;do"
#endif #endif
, ,
[Inf_BIBLIOGRAPHY] = [Inf_BIBLIOGRAPHY] =