diff --git a/swad_changelog.h b/swad_changelog.h index 9dab4ea87..ab8c74c94 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -35,11 +35,12 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 14.44.3 (2014/12/27)" +#define Log_PLATFORM_VERSION "SWAD 14.45 (2014/12/27)" // 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 | tail -1 /* + Version 14.45 :Dic 27, 2014 Course syllabus are shown in one unique option (unfinished). (174346 lines) Version 14.44.3 :Dic 27, 2014 Fixed bugs in layout. (174246 lines) Version 14.44.2 :Dic 27, 2014 Fixed bugs in layout columns. (174262 lines) Version 14.44.1 :Dic 27, 2014 Changes in layout columns. (174251 lines) diff --git a/swad_forum.c b/swad_forum.c index 7dba87d66..49b8a2560 100644 --- a/swad_forum.c +++ b/swad_forum.c @@ -1675,32 +1675,38 @@ void For_ShowForumList (void) static void For_PutFormWhichForums (void) { - extern const char *The_ClassFormul[The_NUM_THEMES]; - extern const char *Txt_FORUM_WHICH_FORUM[2]; + extern const char *Txt_FORUM_WHICH_FORUM[For_NUM_WHICH_FORUMS]; For_WhichForums_t WhichForums; /***** Form to select which forums I want to see (all my forums or only the forums of current institution/degree/course) *****/ fprintf (Gbl.F.Out,"" - "", - The_ClassFormul[Gbl.Prefs.Theme]); + ""); Act_FormStart (ActSeeFor); For_PutParamForumOrder (); For_PutParamsForumInsDegCrs (); + fprintf (Gbl.F.Out,"" + "" + "" + ""); } /*****************************************************************************/ diff --git a/swad_global.c b/swad_global.c index 6c1d263c4..0bbb80182 100644 --- a/swad_global.c +++ b/swad_global.c @@ -348,6 +348,7 @@ void Gbl_InitializeGlobals (void) Gbl.CurrentCrs.Records.LstFields.NestedCalls = 0; Gbl.CurrentCrs.Syllabus.EditionIsActive = false; + Gbl.CurrentCrs.Syllabus.WhichSyllabus = Syl_LECTURES; Gbl.Search.WhatToSearch = Sch_SEARCH_ALL; Gbl.Search.Str[0] = '\0'; diff --git a/swad_global.h b/swad_global.h index 4422cea4e..6a17e03ad 100644 --- a/swad_global.h +++ b/swad_global.h @@ -442,6 +442,7 @@ struct Globals char PathDir[PATH_MAX+1]; unsigned NumItem; bool EditionIsActive; + Syl_WhichSyllabus_t WhichSyllabus; } Syllabus; struct { diff --git a/swad_info.c b/swad_info.c index 14476a10c..00ddddef2 100644 --- a/swad_info.c +++ b/swad_info.c @@ -307,6 +307,16 @@ void Inf_ShowInfo (void) /***** Get info source from database *****/ Inf_GetInfoSrcFromDB (Gbl.CurrentCrs.Crs.CrsCod,InfoType,&InfoSrc,&MustBeRead); + switch (InfoType) + { + case Inf_LECTURES: + case Inf_PRACTICALS: + Syl_PutFormWhichSyllabus (); + break; + default: + break; + } + switch (Gbl.Usrs.Me.LoggedRole) { case Rol_ROLE_STUDENT: diff --git a/swad_syllabus.c b/swad_syllabus.c index e75f35c0f..0e2c96ab2 100644 --- a/swad_syllabus.c +++ b/swad_syllabus.c @@ -107,6 +107,40 @@ static void Syl_ShowRowSyllabus (Inf_InfoType_t InfoType,unsigned NumItem,int Le static void Syl_WriteSyllabusIntoHTMLTmpFile (Inf_InfoType_t InfoType,FILE *FileHTMLTmp); static void Syl_PutFormItemSyllabus (Inf_InfoType_t InfoType,bool NewItem,unsigned NumItem,int Level,int *CodItem,const char *Text,const char *Color); +/*****************************************************************************/ +/************************ Write form to select syllabus **********************/ +/*****************************************************************************/ + +void Syl_PutFormWhichSyllabus (void) + { + extern const char *Txt_SYLLABUS_WHICH_SYLLABUS[Syl_NUM_WHICH_SYLLABUS]; + Syl_WhichSyllabus_t WhichSyllabus; + + /***** Form to select which forums I want to see + (all my forums or only the forums of current institution/degree/course) *****/ + Act_FormStart (ActSeeSylLec); + fprintf (Gbl.F.Out,"" + ""); + } + /*****************************************************************************/ /************** Get parameter item number in program edition *****************/ /*****************************************************************************/ diff --git a/swad_syllabus.h b/swad_syllabus.h index 4b8869ab2..5d5eca2d2 100644 --- a/swad_syllabus.h +++ b/swad_syllabus.h @@ -28,9 +28,16 @@ /*****************************************************************************/ /*****************************************************************************/ -/******************************* Public types ********************************/ +/************************ Public constants and types *************************/ /*****************************************************************************/ +#define Syl_NUM_WHICH_SYLLABUS 2 +typedef enum + { + Syl_LECTURES = 0, + Syl_PRACTICALS = 1, + } Syl_WhichSyllabus_t; // Which syllabus I want to see + typedef enum { Syl_GET_UP, @@ -57,6 +64,8 @@ struct MoveSubtrees /***************************** Public prototypes *****************************/ /*****************************************************************************/ +void Syl_PutFormWhichSyllabus (void); + void Syl_GetParamItemNumber (void); void Syl_EditSyllabus (void); void Syl_FreeListItemsSyllabus (void); diff --git a/swad_text.c b/swad_text.c index 1144244f5..e3dc6ceae 100644 --- a/swad_text.c +++ b/swad_text.c @@ -81,6 +81,7 @@ #include "swad_record.h" #include "swad_statistic.h" #include "swad_survey.h" +#include "swad_syllabus.h" #include "swad_test.h" #include "swad_text.h" #include "swad_timetable.h" @@ -4413,27 +4414,6 @@ const char *Txt_Comments = "Comentários"; #endif -const char *Txt_Student_comment = -#if L==0 - "Comentari de l'estudiant"; -#elif L==1 - "Student-Kommentar"; -#elif L==2 - "Student's comment"; -#elif L==3 - "Comentario del estudiante"; -#elif L==4 - "Commentaire de l'étudiant"; -#elif L==5 - "Comentario del estudiante"; // Okoteve traducción -#elif L==6 - "Commento di student"; -#elif L==7 - "Komentarz studenta"; -#elif L==8 - "Comentário do estudante"; -#endif - const char *Txt_Teachers_comment = #if L==0 "Comentari de professors"; @@ -35514,43 +35494,43 @@ const char *Txt_Show_right_column = const char *Txt_Show_WHICH_groups[2] = { #if L==0 - "Mostrar només els meus grups" + "Només els meus grups" #elif L==1 - "Zeige nur meine Gruppen" + "Nur meine Gruppen" #elif L==2 - "Show only my groups" + "Only my groups" #elif L==3 - "Mostrar sólo mis grupos" + "Sólo mis grupos" #elif L==4 - "Afficher uniquement mes groupes" + "Uniquement mes groupes" #elif L==5 - "Mostrar sólo mis grupos" // Okoteve traducción + "Sólo mis grupos" // Okoteve traducción #elif L==6 - "Mostra solo i miei gruppi" + "Solo i miei gruppi" #elif L==7 - "Show only my groups" // Potrzebujesz tlumaczenie + "Only my groups" // Potrzebujesz tlumaczenie #elif L==8 - "Mostrar apenas os meus grupos" + "Apenas os meus grupos" #endif , #if L==0 - "Mostrar tots els grups" + "Tots els grups" #elif L==1 - "Zeige alle Gruppen" + "Alle Gruppen" #elif L==2 - "Show all groups" + "All groups" #elif L==3 - "Mostrar todos los grupos" + "Todos los grupos" #elif L==4 - "Afficher tous les groupes" + "Tous les groupes" #elif L==5 - "Mostrar todos los grupos" // Okoteve traducción + "Todos los grupos" // Okoteve traducción #elif L==6 - "Mostra tutti i gruppi" + "Tutti i gruppi" #elif L==7 - "Show all groups" // Potrzebujesz tlumaczenie + "All groups" // Potrzebujesz tlumaczenie #elif L==8 - "Mostrar todos os grupos" + "Todos os grupos" #endif }; @@ -37400,6 +37380,27 @@ const char *Txt_Status = "Status"; #endif +const char *Txt_Stay_connected_with_SWADroid = +#if L==0 + "Seguiu connectat/da amb SWADroid."; +#elif L==1 + "Stay connected with SWADroid."; // Need Übersetzung +#elif L==2 + "Stay connected with SWADroid."; +#elif L==3 + "Siga conectado/a con SWADroid."; +#elif L==4 + "Stay connected with SWADroid."; // Besoin de traduction +#elif L==5 + "Siga conectado/a con SWADroid."; // Okoteve traducción +#elif L==6 + "Resta in contatto con SWADroid."; +#elif L==7 + "Stay connected with SWADroid."; // Potrzebujesz tlumaczenie +#elif L==8 + "Stay connected with SWADroid."; // Necessita de tradução +#endif + const char *Txt_Stem = // Stem of a test question #if L==0 "Enunciat"; @@ -37526,6 +37527,27 @@ const char *Txt_Step_5_Confirm_the_enrollment_removing = "Step 5: Confirm the enrollment / removing"; // Necessita de tradução #endif +const char *Txt_Student_comment = +#if L==0 + "Comentari de l'estudiant"; +#elif L==1 + "Student-Kommentar"; +#elif L==2 + "Student's comment"; +#elif L==3 + "Comentario del estudiante"; +#elif L==4 + "Commentaire de l'étudiant"; +#elif L==5 + "Comentario del estudiante"; // Okoteve traducción +#elif L==6 + "Commento di student"; +#elif L==7 + "Komentarz studenta"; +#elif L==8 + "Comentário do estudante"; +#endif + const char *Txt_Students_ABBREVIATION = // Abbreviation of "Students" #if L==0 "Estud."; @@ -38175,6 +38197,52 @@ const char *Txt_Syllabus_of_the_course = "Programa da disciplina"; #endif +extern const char *Txt_SYLLABUS_WHICH_SYLLABUS[Syl_NUM_WHICH_SYLLABUS] = + { + // Lectures +#if L==0 + "Teoria" +#elif L==1 + "Vorlesung" +#elif L==2 + "Lectures" +#elif L==3 + "Teoría" +#elif L==4 + "Théorie" +#elif L==5 + "Teoría" // Okoteve traducción +#elif L==6 + "Teoria" +#elif L==7 + "Wyklady" +#elif L==8 + "Teoria" +#endif + , + // Practicals +#if L==0 + "Pràct." +#elif L==1 + "Übung" +#elif L==2 + "Practicals" +#elif L==3 + "Práct." +#elif L==4 + "Pratique" +#elif L==5 + "Práct." // Okoteve traducción +#elif L==6 + "Pratica" +#elif L==7 + "praktyki" +#elif L==8 + "Práct." +#endif + , + }; + const char *Txt_System = #if L==0 "Plataforma"; @@ -50490,27 +50558,6 @@ const char *Txt_You_can_send_a_file_with_an_image_in_jpg_format_and_size_X_Y = / " and size %u×%u pixels."; // Necessita de tradução #endif -const char *Txt_Stay_connected_with_SWADroid = -#if L==0 - "Seguiu connectat/da amb SWADroid."; -#elif L==1 - "Stay connected with SWADroid."; // Need Übersetzung -#elif L==2 - "Stay connected with SWADroid."; -#elif L==3 - "Siga conectado/a con SWADroid."; -#elif L==4 - "Stay connected with SWADroid."; // Besoin de traduction -#elif L==5 - "Siga conectado/a con SWADroid."; // Okoteve traducción -#elif L==6 - "Resta in contatto con SWADroid."; -#elif L==7 - "Stay connected with SWADroid."; // Potrzebujesz tlumaczenie -#elif L==8 - "Stay connected with SWADroid."; // Necessita de tradução -#endif - const char *Txt_You_dont_have_permission_to_access_to_this_forum = #if L==0 "No té permís per accedir a aquest fòrum."; diff --git a/swad_timetable.c b/swad_timetable.c index 434f4d2a1..0807309a3 100644 --- a/swad_timetable.c +++ b/swad_timetable.c @@ -289,7 +289,7 @@ void TT_ShowClassTimeTable (void) { /***** Select whether show only my groups or all groups *****/ fprintf (Gbl.F.Out,"" - ""); + ""); Act_FormStart (Gbl.CurrentAct); Grp_ShowSelectorWhichGrps (); fprintf (Gbl.F.Out,""