From 12b0281211390c15ceec24e2545b8b6a10686d8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Sun, 28 Dec 2014 02:42:41 +0100 Subject: [PATCH] Version 14.46 --- swad_action.c | 100 ++++++------ swad_action.h | 409 ++++++++++++++++++++++++----------------------- swad_changelog.h | 6 +- swad_global.c | 2 +- swad_info.c | 18 ++- swad_syllabus.c | 57 ++++++- swad_syllabus.h | 2 + swad_text.c | 138 +++++----------- 8 files changed, 365 insertions(+), 367 deletions(-) diff --git a/swad_action.c b/swad_action.c index 2fb63239..4f201f7f 100644 --- a/swad_action.c +++ b/swad_action.c @@ -71,7 +71,7 @@ extern struct Globals Gbl; /************************ Internal global variables **************************/ /*****************************************************************************/ /* -901 actions in one CGI: +902 actions in one CGI: 0. ActAll Any action (used for statistics) 1. ActUnk Unknown action 2. ActHom Show home menu @@ -259,6 +259,7 @@ Course: 153. ActSeeCrsInf Show information on the current course 154. ActSeeTchGui Show teaching guide of the course + ---. ActSeeSyl Show syllabus (lectures or practicals) 155. ActSeeSylLec Show the syllabus of lectures 156. ActSeeSylPra Show the syllabus of practicals 157. ActSeeAdmDoc Documents zone (see or admin) @@ -1105,8 +1106,7 @@ const struct Act_Menu Act_Menu[Act_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] = {ActSeeCrsInf ,false}, {ActSeeTchGui ,false}, - {ActSeeSylLec ,false}, - {ActSeeSylPra ,true }, + {ActSeeSyl ,true }, {ActSeeAdmDoc ,false}, {ActAdmCom ,true }, @@ -1408,15 +1408,14 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] = /* ActSeeCrsInf */{ 847, 1,TabCrs,ActSeeCrsInf ,0x1FF,0x1FF,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Crs_ShowIntroduction ,"info" }, /* ActSeeTchGui */{ 784, 2,TabCrs,ActSeeTchGui ,0x1FF,0x1FF,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Inf_ShowInfo ,"guide" }, - /* ActSeeSylLec */{ 28, 3,TabCrs,ActSeeSylLec ,0x1FF,0x1FF,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Inf_ShowInfo ,"presentation" }, - /* ActSeeSylPra */{ 20, 4,TabCrs,ActSeeSylPra ,0x1FF,0x1FF,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Inf_ShowInfo ,"lab" }, - /* ActSeeAdmDoc */{ 0, 5,TabCrs,ActSeeAdmDoc ,0x1FF,0x1FF,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Brw_ShowFileBrowserOrWorks ,"folder" }, - /* ActAdmCom */{ 461, 6,TabCrs,ActAdmCom ,0x1FF,0x1FF,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Brw_ShowFileBrowserOrWorks ,"folderusers" }, - /* ActSeeCal */{ 16, 7,TabCrs,ActSeeCal ,0x1FF,0x1FF,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Dat_DrawCalendar ,"date" }, - /* ActSeeCrsTimTbl */{ 25, 8,TabCrs,ActSeeCrsTimTbl ,0x1FF,0x1FF,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,TT_ShowClassTimeTable ,"clock" }, - /* ActSeeBib */{ 32, 9,TabCrs,ActSeeBib ,0x1FF,0x1FF,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Inf_ShowInfo ,"books" }, - /* ActSeeFAQ */{ 54,10,TabCrs,ActSeeFAQ ,0x118,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Inf_ShowInfo ,"faq" }, - /* ActSeeCrsLnk */{ 9,11,TabCrs,ActSeeCrsLnk ,0x118,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Inf_ShowInfo ,"link" }, + /* ActSeeSyl */{1242, 3,TabCrs,ActSeeSyl ,0x1FF,0x1FF,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Inf_ShowInfo ,"presentation" }, + /* ActSeeAdmDoc */{ 0, 4,TabCrs,ActSeeAdmDoc ,0x1FF,0x1FF,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Brw_ShowFileBrowserOrWorks ,"folder" }, + /* ActAdmCom */{ 461, 5,TabCrs,ActAdmCom ,0x1FF,0x1FF,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Brw_ShowFileBrowserOrWorks ,"folderusers" }, + /* ActSeeCal */{ 16, 6,TabCrs,ActSeeCal ,0x1FF,0x1FF,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Dat_DrawCalendar ,"date" }, + /* ActSeeCrsTimTbl */{ 25, 7,TabCrs,ActSeeCrsTimTbl ,0x1FF,0x1FF,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,TT_ShowClassTimeTable ,"clock" }, + /* ActSeeBib */{ 32, 8,TabCrs,ActSeeBib ,0x1FF,0x1FF,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Inf_ShowInfo ,"books" }, + /* ActSeeFAQ */{ 54, 9,TabCrs,ActSeeFAQ ,0x118,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Inf_ShowInfo ,"faq" }, + /* ActSeeCrsLnk */{ 9,10,TabCrs,ActSeeCrsLnk ,0x118,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Inf_ShowInfo ,"link" }, // Actions not in menu: /* ActDegSch */{1185,-1,TabCrs,ActCrsReqSch ,0x1FF,0x1FF,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,Sch_GetParamsSearch ,Sch_CrsSearch ,NULL}, @@ -1429,22 +1428,24 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] = /* ActPrnCrsTimTbl */{ 152,-1,TabCrs,ActSeeCrsTimTbl ,0x1FF,0x1FF,0x000,Act_CONTENT_NORM,Act_NEW_WINDOW ,NULL ,TT_ShowClassTimeTable ,NULL}, /* ActEdiCrsTimTbl */{ 45,-1,TabCrs,ActSeeCrsTimTbl ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,TT_EditCrsTimeTable ,NULL}, /* ActChgCrsTimTbl */{ 53,-1,TabCrs,ActSeeCrsTimTbl ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,TT_EditCrsTimeTable ,NULL}, - /* ActEdiSylLec */{ 44,-1,TabCrs,ActSeeSylLec ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Inf_FormsToSelSendInfo ,NULL}, - /* ActEdiSylPra */{ 74,-1,TabCrs,ActSeeSylPra ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Inf_FormsToSelSendInfo ,NULL}, - /* ActDelItmSylLec */{ 218,-1,TabCrs,ActSeeSylLec ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Syl_RemoveItemSyllabus ,NULL}, - /* ActDelItmSylPra */{ 183,-1,TabCrs,ActSeeSylPra ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Syl_RemoveItemSyllabus ,NULL}, - /* ActUp_IteSylLec */{ 221,-1,TabCrs,ActSeeSylLec ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Syl_UpItemSyllabus ,NULL}, - /* ActUp_IteSylPra */{ 213,-1,TabCrs,ActSeeSylPra ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Syl_UpItemSyllabus ,NULL}, - /* ActDwnIteSylLec */{ 220,-1,TabCrs,ActSeeSylLec ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Syl_DownItemSyllabus ,NULL}, - /* ActDwnIteSylPra */{ 212,-1,TabCrs,ActSeeSylPra ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Syl_DownItemSyllabus ,NULL}, - /* ActRgtIteSylLec */{ 223,-1,TabCrs,ActSeeSylLec ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Syl_RightItemSyllabus ,NULL}, - /* ActRgtIteSylPra */{ 215,-1,TabCrs,ActSeeSylPra ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Syl_RightItemSyllabus ,NULL}, - /* ActLftIteSylLec */{ 222,-1,TabCrs,ActSeeSylLec ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Syl_LeftItemSyllabus ,NULL}, - /* ActLftIteSylPra */{ 214,-1,TabCrs,ActSeeSylPra ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Syl_LeftItemSyllabus ,NULL}, - /* ActInsIteSylLec */{ 217,-1,TabCrs,ActSeeSylLec ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Syl_InsertItemSyllabus ,NULL}, - /* ActInsIteSylPra */{ 181,-1,TabCrs,ActSeeSylPra ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Syl_InsertItemSyllabus ,NULL}, - /* ActModIteSylLec */{ 211,-1,TabCrs,ActSeeSylLec ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Syl_ModifyItemSyllabus ,NULL}, - /* ActModIteSylPra */{ 216,-1,TabCrs,ActSeeSylPra ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Syl_ModifyItemSyllabus ,NULL}, + /* ActSeeSylLec */{ 28,-1,TabCrs,ActSeeSyl ,0x1FF,0x1FF,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Inf_ShowInfo ,NULL}, + /* ActSeeSylPra */{ 20,-1,TabCrs,ActSeeSyl ,0x1FF,0x1FF,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Inf_ShowInfo ,NULL}, + /* ActEdiSylLec */{ 44,-1,TabCrs,ActSeeSyl ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Inf_FormsToSelSendInfo ,NULL}, + /* ActEdiSylPra */{ 74,-1,TabCrs,ActSeeSyl ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Inf_FormsToSelSendInfo ,NULL}, + /* ActDelItmSylLec */{ 218,-1,TabCrs,ActSeeSyl ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Syl_RemoveItemSyllabus ,NULL}, + /* ActDelItmSylPra */{ 183,-1,TabCrs,ActSeeSyl ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Syl_RemoveItemSyllabus ,NULL}, + /* ActUp_IteSylLec */{ 221,-1,TabCrs,ActSeeSyl ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Syl_UpItemSyllabus ,NULL}, + /* ActUp_IteSylPra */{ 213,-1,TabCrs,ActSeeSyl ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Syl_UpItemSyllabus ,NULL}, + /* ActDwnIteSylLec */{ 220,-1,TabCrs,ActSeeSyl ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Syl_DownItemSyllabus ,NULL}, + /* ActDwnIteSylPra */{ 212,-1,TabCrs,ActSeeSyl ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Syl_DownItemSyllabus ,NULL}, + /* ActRgtIteSylLec */{ 223,-1,TabCrs,ActSeeSyl ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Syl_RightItemSyllabus ,NULL}, + /* ActRgtIteSylPra */{ 215,-1,TabCrs,ActSeeSyl ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Syl_RightItemSyllabus ,NULL}, + /* ActLftIteSylLec */{ 222,-1,TabCrs,ActSeeSyl ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Syl_LeftItemSyllabus ,NULL}, + /* ActLftIteSylPra */{ 214,-1,TabCrs,ActSeeSyl ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Syl_LeftItemSyllabus ,NULL}, + /* ActInsIteSylLec */{ 217,-1,TabCrs,ActSeeSyl ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Syl_InsertItemSyllabus ,NULL}, + /* ActInsIteSylPra */{ 181,-1,TabCrs,ActSeeSyl ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Syl_InsertItemSyllabus ,NULL}, + /* ActModIteSylLec */{ 211,-1,TabCrs,ActSeeSyl ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Syl_ModifyItemSyllabus ,NULL}, + /* ActModIteSylPra */{ 216,-1,TabCrs,ActSeeSyl ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Syl_ModifyItemSyllabus ,NULL}, /* ActChgToSeeDoc */{1195,-1,TabCrs,ActSeeAdmDoc ,0x1FF,0x1FF,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Brw_ShowFileBrowserOrWorks ,NULL}, @@ -1556,80 +1557,80 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] = /* ActChgFrcReaCrsInf*/{ 877,-1,TabCrs,ActSeeCrsInf ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Inf_ChangeForceReadInfo ,NULL}, /* ActChgFrcReaTchGui*/{ 870,-1,TabCrs,ActSeeTchGui ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Inf_ChangeForceReadInfo ,NULL}, - /* ActChgFrcReaSylLec*/{ 871,-1,TabCrs,ActSeeSylLec ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Inf_ChangeForceReadInfo ,NULL}, - /* ActChgFrcReaSylPra*/{ 872,-1,TabCrs,ActSeeSylPra ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Inf_ChangeForceReadInfo ,NULL}, + /* ActChgFrcReaSylLec*/{ 871,-1,TabCrs,ActSeeSyl ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Inf_ChangeForceReadInfo ,NULL}, + /* ActChgFrcReaSylPra*/{ 872,-1,TabCrs,ActSeeSyl ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Inf_ChangeForceReadInfo ,NULL}, /* ActChgFrcReaBib */{ 873,-1,TabCrs,ActSeeBib ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Inf_ChangeForceReadInfo ,NULL}, /* ActChgFrcReaFAQ */{ 874,-1,TabCrs,ActSeeFAQ ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Inf_ChangeForceReadInfo ,NULL}, /* ActChgFrcReaCrsLnk*/{ 875,-1,TabCrs,ActSeeCrsLnk ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Inf_ChangeForceReadInfo ,NULL}, /* ActChgHavReaCrsInf*/{ 878,-1,TabCrs,ActSeeCrsInf ,0x008,0x000,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Inf_ChangeIHaveReadInfo ,NULL}, /* ActChgHavReaTchGui*/{ 886,-1,TabCrs,ActSeeTchGui ,0x008,0x000,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Inf_ChangeIHaveReadInfo ,NULL}, - /* ActChgHavReaSylLec*/{ 880,-1,TabCrs,ActSeeSylLec ,0x008,0x000,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Inf_ChangeIHaveReadInfo ,NULL}, - /* ActChgHavReaSylPra*/{ 887,-1,TabCrs,ActSeeSylPra ,0x008,0x000,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Inf_ChangeIHaveReadInfo ,NULL}, + /* ActChgHavReaSylLec*/{ 880,-1,TabCrs,ActSeeSyl ,0x008,0x000,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Inf_ChangeIHaveReadInfo ,NULL}, + /* ActChgHavReaSylPra*/{ 887,-1,TabCrs,ActSeeSyl ,0x008,0x000,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Inf_ChangeIHaveReadInfo ,NULL}, /* ActChgHavReaBib */{ 884,-1,TabCrs,ActSeeBib ,0x008,0x000,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Inf_ChangeIHaveReadInfo ,NULL}, /* ActChgHavReaFAQ */{ 879,-1,TabCrs,ActSeeFAQ ,0x008,0x000,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Inf_ChangeIHaveReadInfo ,NULL}, /* ActChgHavReaCrsLnk*/{ 885,-1,TabCrs,ActSeeCrsLnk ,0x008,0x000,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Inf_ChangeIHaveReadInfo ,NULL}, /* ActSelInfSrcCrsInf*/{ 849,-1,TabCrs,ActSeeCrsInf ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Inf_SetInfoSrc ,NULL}, /* ActSelInfSrcTchGui*/{ 789,-1,TabCrs,ActSeeTchGui ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Inf_SetInfoSrc ,NULL}, - /* ActSelInfSrcSylLec*/{ 378,-1,TabCrs,ActSeeSylLec ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Inf_SetInfoSrc ,NULL}, - /* ActSelInfSrcSylPra*/{ 382,-1,TabCrs,ActSeeSylPra ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Inf_SetInfoSrc ,NULL}, + /* ActSelInfSrcSylLec*/{ 378,-1,TabCrs,ActSeeSyl ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Inf_SetInfoSrc ,NULL}, + /* ActSelInfSrcSylPra*/{ 382,-1,TabCrs,ActSeeSyl ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Inf_SetInfoSrc ,NULL}, /* ActSelInfSrcBib */{ 370,-1,TabCrs,ActSeeBib ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Inf_SetInfoSrc ,NULL}, /* ActSelInfSrcFAQ */{ 380,-1,TabCrs,ActSeeFAQ ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Inf_SetInfoSrc ,NULL}, /* ActSelInfSrcCrsLnk*/{ 385,-1,TabCrs,ActSeeCrsLnk ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Inf_SetInfoSrc ,NULL}, /* ActRcvURLCrsInf */{ 854,-1,TabCrs,ActSeeCrsInf ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Inf_ReceiveURLInfo ,NULL}, /* ActRcvURLTchGui */{ 791,-1,TabCrs,ActSeeTchGui ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Inf_ReceiveURLInfo ,NULL}, - /* ActRcvURLSylLec */{ 403,-1,TabCrs,ActSeeSylLec ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Inf_ReceiveURLInfo ,NULL}, - /* ActRcvURLSylPra */{ 402,-1,TabCrs,ActSeeSylPra ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Inf_ReceiveURLInfo ,NULL}, + /* ActRcvURLSylLec */{ 403,-1,TabCrs,ActSeeSyl ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Inf_ReceiveURLInfo ,NULL}, + /* ActRcvURLSylPra */{ 402,-1,TabCrs,ActSeeSyl ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Inf_ReceiveURLInfo ,NULL}, /* ActRcvURLBib */{ 224,-1,TabCrs,ActSeeBib ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Inf_ReceiveURLInfo ,NULL}, /* ActRcvURLFAQ */{ 234,-1,TabCrs,ActSeeFAQ ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Inf_ReceiveURLInfo ,NULL}, /* ActRcvURLCrsLnk */{ 182,-1,TabCrs,ActSeeCrsLnk ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Inf_ReceiveURLInfo ,NULL}, /* ActRcvPagCrsInf */{ 853,-1,TabCrs,ActSeeCrsInf ,0x110,0x100,0x000,Act_CONTENT_DATA,Act_MAIN_WINDOW,NULL ,Inf_ReceivePagInfo ,NULL}, /* ActRcvPagTchGui */{ 788,-1,TabCrs,ActSeeTchGui ,0x110,0x100,0x000,Act_CONTENT_DATA,Act_MAIN_WINDOW,NULL ,Inf_ReceivePagInfo ,NULL}, - /* ActRcvPagSylLec */{ 381,-1,TabCrs,ActSeeSylLec ,0x110,0x100,0x000,Act_CONTENT_DATA,Act_MAIN_WINDOW,NULL ,Inf_ReceivePagInfo ,NULL}, - /* ActRcvPagSylPra */{ 383,-1,TabCrs,ActSeeSylPra ,0x110,0x100,0x000,Act_CONTENT_DATA,Act_MAIN_WINDOW,NULL ,Inf_ReceivePagInfo ,NULL}, + /* ActRcvPagSylLec */{ 381,-1,TabCrs,ActSeeSyl ,0x110,0x100,0x000,Act_CONTENT_DATA,Act_MAIN_WINDOW,NULL ,Inf_ReceivePagInfo ,NULL}, + /* ActRcvPagSylPra */{ 383,-1,TabCrs,ActSeeSyl ,0x110,0x100,0x000,Act_CONTENT_DATA,Act_MAIN_WINDOW,NULL ,Inf_ReceivePagInfo ,NULL}, /* ActRcvPagBib */{ 185,-1,TabCrs,ActSeeBib ,0x110,0x100,0x000,Act_CONTENT_DATA,Act_MAIN_WINDOW,NULL ,Inf_ReceivePagInfo ,NULL}, /* ActRcvPagFAQ */{ 219,-1,TabCrs,ActSeeFAQ ,0x110,0x100,0x000,Act_CONTENT_DATA,Act_MAIN_WINDOW,NULL ,Inf_ReceivePagInfo ,NULL}, /* ActRcvPagCrsLnk */{ 164,-1,TabCrs,ActSeeCrsLnk ,0x110,0x100,0x000,Act_CONTENT_DATA,Act_MAIN_WINDOW,NULL ,Inf_ReceivePagInfo ,NULL}, /* ActEditorCrsInf */{ 852,-1,TabCrs,ActSeeCrsInf ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Inf_EditorCourseInfo ,NULL}, /* ActEditorTchGui */{ 786,-1,TabCrs,ActSeeTchGui ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Inf_EditorTeachingGuide ,NULL}, - /* ActEditorSylLec */{ 372,-1,TabCrs,ActSeeSylLec ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Syl_EditSyllabus ,NULL}, - /* ActEditorSylPra */{ 371,-1,TabCrs,ActSeeSylPra ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Syl_EditSyllabus ,NULL}, + /* ActEditorSylLec */{ 372,-1,TabCrs,ActSeeSyl ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Syl_EditSyllabus ,NULL}, + /* ActEditorSylPra */{ 371,-1,TabCrs,ActSeeSyl ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Syl_EditSyllabus ,NULL}, /* ActEditorBib */{ 376,-1,TabCrs,ActSeeBib ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Inf_EditorBibliography ,NULL}, /* ActEditorFAQ */{ 404,-1,TabCrs,ActSeeFAQ ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Inf_EditorFAQ ,NULL}, /* ActEditorCrsLnk */{ 388,-1,TabCrs,ActSeeCrsLnk ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Inf_EditorLinks ,NULL}, /* ActPlaTxtEdiCrsInf*/{ 850,-1,TabCrs,ActSeeCrsInf ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Inf_EditPlainTxtInfo ,NULL}, /* ActPlaTxtEdiTchGui*/{ 787,-1,TabCrs,ActSeeTchGui ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Inf_EditPlainTxtInfo ,NULL}, - /* ActPlaTxtEdiSylLec*/{ 379,-1,TabCrs,ActSeeSylLec ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Inf_EditPlainTxtInfo ,NULL}, - /* ActPlaTxtEdiSylPra*/{ 389,-1,TabCrs,ActSeeSylPra ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Inf_EditPlainTxtInfo ,NULL}, + /* ActPlaTxtEdiSylLec*/{ 379,-1,TabCrs,ActSeeSyl ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Inf_EditPlainTxtInfo ,NULL}, + /* ActPlaTxtEdiSylPra*/{ 389,-1,TabCrs,ActSeeSyl ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Inf_EditPlainTxtInfo ,NULL}, /* ActPlaTxtEdiBib */{ 377,-1,TabCrs,ActSeeBib ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Inf_EditPlainTxtInfo ,NULL}, /* ActPlaTxtEdiFAQ */{ 405,-1,TabCrs,ActSeeFAQ ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Inf_EditPlainTxtInfo ,NULL}, /* ActPlaTxtEdiCrsLnk*/{ 400,-1,TabCrs,ActSeeCrsLnk ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Inf_EditPlainTxtInfo ,NULL}, /* ActRchTxtEdiCrsInf*/{1093,-1,TabCrs,ActSeeCrsInf ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Inf_EditRichTxtInfo ,NULL}, /* ActRchTxtEdiTchGui*/{1094,-1,TabCrs,ActSeeTchGui ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Inf_EditRichTxtInfo ,NULL}, - /* ActRchTxtEdiSylLec*/{1095,-1,TabCrs,ActSeeSylLec ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Inf_EditRichTxtInfo ,NULL}, - /* ActRchTxtEdiSylPra*/{1096,-1,TabCrs,ActSeeSylPra ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Inf_EditRichTxtInfo ,NULL}, + /* ActRchTxtEdiSylLec*/{1095,-1,TabCrs,ActSeeSyl ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Inf_EditRichTxtInfo ,NULL}, + /* ActRchTxtEdiSylPra*/{1096,-1,TabCrs,ActSeeSyl ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Inf_EditRichTxtInfo ,NULL}, /* ActRchTxtEdiBib */{1097,-1,TabCrs,ActSeeBib ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Inf_EditRichTxtInfo ,NULL}, /* ActRchTxtEdiFAQ */{1098,-1,TabCrs,ActSeeFAQ ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Inf_EditRichTxtInfo ,NULL}, /* ActRchTxtEdiCrsLnk*/{1099,-1,TabCrs,ActSeeCrsLnk ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Inf_EditRichTxtInfo ,NULL}, /* ActRcvPlaTxtCrsInf*/{ 851,-1,TabCrs,ActSeeCrsInf ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Inf_RecAndChangePlainTxtInfo ,NULL}, /* ActRcvPlaTxtTchGui*/{ 790,-1,TabCrs,ActSeeTchGui ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Inf_RecAndChangePlainTxtInfo ,NULL}, - /* ActRcvPlaTxtSylLec*/{ 394,-1,TabCrs,ActSeeSylLec ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Inf_RecAndChangePlainTxtInfo ,NULL}, - /* ActRcvPlaTxtSylPra*/{ 396,-1,TabCrs,ActSeeSylPra ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Inf_RecAndChangePlainTxtInfo ,NULL}, + /* ActRcvPlaTxtSylLec*/{ 394,-1,TabCrs,ActSeeSyl ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Inf_RecAndChangePlainTxtInfo ,NULL}, + /* ActRcvPlaTxtSylPra*/{ 396,-1,TabCrs,ActSeeSyl ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Inf_RecAndChangePlainTxtInfo ,NULL}, /* ActRcvPlaTxtBib */{ 398,-1,TabCrs,ActSeeBib ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Inf_RecAndChangePlainTxtInfo ,NULL}, /* ActRcvPlaTxtFAQ */{ 406,-1,TabCrs,ActSeeFAQ ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Inf_RecAndChangePlainTxtInfo ,NULL}, /* ActRcvPlaTxtCrsLnk*/{ 401,-1,TabCrs,ActSeeCrsLnk ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Inf_RecAndChangePlainTxtInfo ,NULL}, /* ActRcvRchTxtCrsInf*/{1101,-1,TabCrs,ActSeeCrsInf ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Inf_RecAndChangeRichTxtInfo ,NULL}, /* ActRcvRchTxtTchGui*/{1102,-1,TabCrs,ActSeeTchGui ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Inf_RecAndChangeRichTxtInfo ,NULL}, - /* ActRcvRchTxtSylLec*/{1103,-1,TabCrs,ActSeeSylLec ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Inf_RecAndChangeRichTxtInfo ,NULL}, - /* ActRcvRchTxtSylPra*/{1104,-1,TabCrs,ActSeeSylPra ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Inf_RecAndChangeRichTxtInfo ,NULL}, + /* ActRcvRchTxtSylLec*/{1103,-1,TabCrs,ActSeeSyl ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Inf_RecAndChangeRichTxtInfo ,NULL}, + /* ActRcvRchTxtSylPra*/{1104,-1,TabCrs,ActSeeSyl ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Inf_RecAndChangeRichTxtInfo ,NULL}, /* ActRcvRchTxtBib */{1105,-1,TabCrs,ActSeeBib ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Inf_RecAndChangeRichTxtInfo ,NULL}, /* ActRcvRchTxtFAQ */{1106,-1,TabCrs,ActSeeFAQ ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Inf_RecAndChangeRichTxtInfo ,NULL}, /* ActRcvRchTxtCrsLnk*/{1107,-1,TabCrs,ActSeeCrsLnk ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Inf_RecAndChangeRichTxtInfo ,NULL}, @@ -3518,6 +3519,7 @@ Act_Action_t Act_FromActCodToAction[1+Act_MAX_ACTION_COD] = // Do not reuse uniq ActFrmIDsOthUsr, // #1239 ActRemIDOth, // #1240 ActNewIDOth, // #1241 + ActSeeSyl, // #1242 }; /*****************************************************************************/ @@ -4162,7 +4164,7 @@ void Act_WriteSmallMFUActions (struct Act_ListMFUActions *ListMFUActions) /* Icon and text */ fprintf (Gbl.F.Out,"" - ""); Act_FormStart (Action); Act_LinkFormSubmit (Title,"MFU_ACT"); diff --git a/swad_action.h b/swad_action.h index d60f8695..715d372a 100644 --- a/swad_action.h +++ b/swad_action.h @@ -71,9 +71,9 @@ typedef int Act_Action_t; // Must be a signed type, because -1 is used to indica /* Related with tabs, menus, etc. */ #define Act_NUM_TABS (1+11) -#define Act_NUM_ACTIONS (7+52+15+39+22+17+205+182+94+168+28+74) +#define Act_NUM_ACTIONS (7+52+15+39+22+17+206+182+94+168+28+74) -#define Act_MAX_ACTION_COD 1241 +#define Act_MAX_ACTION_COD 1242 #define Act_MAX_OPTIONS_IN_MENU_PER_TAB 20 @@ -286,222 +286,223 @@ typedef int Act_Action_t; // Must be a signed type, because -1 is used to indica #define ActCrsReqSch (ActChgCrsSta+ 1) #define ActSeeCrsInf (ActChgCrsSta+ 2) #define ActSeeTchGui (ActChgCrsSta+ 3) -#define ActSeeSylLec (ActChgCrsSta+ 4) -#define ActSeeSylPra (ActChgCrsSta+ 5) -#define ActSeeAdmDoc (ActChgCrsSta+ 6) -#define ActAdmCom (ActChgCrsSta+ 7) -#define ActSeeCal (ActChgCrsSta+ 8) -#define ActSeeCrsTimTbl (ActChgCrsSta+ 9) -#define ActSeeBib (ActChgCrsSta+ 10) -#define ActSeeFAQ (ActChgCrsSta+ 11) -#define ActSeeCrsLnk (ActChgCrsSta+ 12) +#define ActSeeSyl (ActChgCrsSta+ 4) +#define ActSeeAdmDoc (ActChgCrsSta+ 5) +#define ActAdmCom (ActChgCrsSta+ 6) +#define ActSeeCal (ActChgCrsSta+ 7) +#define ActSeeCrsTimTbl (ActChgCrsSta+ 8) +#define ActSeeBib (ActChgCrsSta+ 9) +#define ActSeeFAQ (ActChgCrsSta+ 10) +#define ActSeeCrsLnk (ActChgCrsSta+ 11) // Secondary actions -#define ActCrsSch (ActChgCrsSta+ 13) -#define ActPrnCrsInf (ActChgCrsSta+ 14) -#define ActChgCrsLog (ActChgCrsSta+ 15) -#define ActEdiCrsInf (ActChgCrsSta+ 16) -#define ActEdiTchGui (ActChgCrsSta+ 17) -#define ActPrnCal (ActChgCrsSta+ 18) -#define ActPrnCrsTimTbl (ActChgCrsSta+ 19) -#define ActEdiCrsTimTbl (ActChgCrsSta+ 20) -#define ActChgCrsTimTbl (ActChgCrsSta+ 21) -#define ActEdiSylLec (ActChgCrsSta+ 22) -#define ActEdiSylPra (ActChgCrsSta+ 23) -#define ActDelItmSylLec (ActChgCrsSta+ 24) -#define ActDelItmSylPra (ActChgCrsSta+ 25) -#define ActUp_IteSylLec (ActChgCrsSta+ 26) -#define ActUp_IteSylPra (ActChgCrsSta+ 27) -#define ActDwnIteSylLec (ActChgCrsSta+ 28) -#define ActDwnIteSylPra (ActChgCrsSta+ 29) -#define ActRgtIteSylLec (ActChgCrsSta+ 30) -#define ActRgtIteSylPra (ActChgCrsSta+ 31) -#define ActLftIteSylLec (ActChgCrsSta+ 32) -#define ActLftIteSylPra (ActChgCrsSta+ 33) -#define ActInsIteSylLec (ActChgCrsSta+ 34) -#define ActInsIteSylPra (ActChgCrsSta+ 35) -#define ActModIteSylLec (ActChgCrsSta+ 36) -#define ActModIteSylPra (ActChgCrsSta+ 37) +#define ActCrsSch (ActChgCrsSta+ 12) +#define ActPrnCrsInf (ActChgCrsSta+ 13) +#define ActChgCrsLog (ActChgCrsSta+ 14) +#define ActEdiCrsInf (ActChgCrsSta+ 15) +#define ActEdiTchGui (ActChgCrsSta+ 16) +#define ActPrnCal (ActChgCrsSta+ 17) +#define ActPrnCrsTimTbl (ActChgCrsSta+ 18) +#define ActEdiCrsTimTbl (ActChgCrsSta+ 19) +#define ActChgCrsTimTbl (ActChgCrsSta+ 20) +#define ActSeeSylLec (ActChgCrsSta+ 21) +#define ActSeeSylPra (ActChgCrsSta+ 22) +#define ActEdiSylLec (ActChgCrsSta+ 23) +#define ActEdiSylPra (ActChgCrsSta+ 24) +#define ActDelItmSylLec (ActChgCrsSta+ 25) +#define ActDelItmSylPra (ActChgCrsSta+ 26) +#define ActUp_IteSylLec (ActChgCrsSta+ 27) +#define ActUp_IteSylPra (ActChgCrsSta+ 28) +#define ActDwnIteSylLec (ActChgCrsSta+ 29) +#define ActDwnIteSylPra (ActChgCrsSta+ 30) +#define ActRgtIteSylLec (ActChgCrsSta+ 31) +#define ActRgtIteSylPra (ActChgCrsSta+ 32) +#define ActLftIteSylLec (ActChgCrsSta+ 33) +#define ActLftIteSylPra (ActChgCrsSta+ 34) +#define ActInsIteSylLec (ActChgCrsSta+ 35) +#define ActInsIteSylPra (ActChgCrsSta+ 36) +#define ActModIteSylLec (ActChgCrsSta+ 37) +#define ActModIteSylPra (ActChgCrsSta+ 38) -#define ActChgToSeeDoc (ActChgCrsSta+ 38) +#define ActChgToSeeDoc (ActChgCrsSta+ 39) -#define ActSeeDocCrs (ActChgCrsSta+ 39) -#define ActExpSeeDocCrs (ActChgCrsSta+ 40) -#define ActConSeeDocCrs (ActChgCrsSta+ 41) -#define ActZIPSeeDocCrs (ActChgCrsSta+ 42) -#define ActReqDatSeeDocCrs (ActChgCrsSta+ 43) -#define ActDowSeeDocCrs (ActChgCrsSta+ 44) +#define ActSeeDocCrs (ActChgCrsSta+ 40) +#define ActExpSeeDocCrs (ActChgCrsSta+ 41) +#define ActConSeeDocCrs (ActChgCrsSta+ 42) +#define ActZIPSeeDocCrs (ActChgCrsSta+ 43) +#define ActReqDatSeeDocCrs (ActChgCrsSta+ 44) +#define ActDowSeeDocCrs (ActChgCrsSta+ 45) -#define ActSeeDocGrp (ActChgCrsSta+ 45) -#define ActExpSeeDocGrp (ActChgCrsSta+ 46) -#define ActConSeeDocGrp (ActChgCrsSta+ 47) -#define ActZIPSeeDocGrp (ActChgCrsSta+ 48) -#define ActReqDatSeeDocGrp (ActChgCrsSta+ 49) -#define ActDowSeeDocGrp (ActChgCrsSta+ 50) +#define ActSeeDocGrp (ActChgCrsSta+ 46) +#define ActExpSeeDocGrp (ActChgCrsSta+ 47) +#define ActConSeeDocGrp (ActChgCrsSta+ 48) +#define ActZIPSeeDocGrp (ActChgCrsSta+ 49) +#define ActReqDatSeeDocGrp (ActChgCrsSta+ 50) +#define ActDowSeeDocGrp (ActChgCrsSta+ 51) -#define ActChgToAdmDoc (ActChgCrsSta+ 51) +#define ActChgToAdmDoc (ActChgCrsSta+ 52) -#define ActAdmDocCrs (ActChgCrsSta+ 52) -#define ActReqRemFilDocCrs (ActChgCrsSta+ 53) -#define ActRemFilDocCrs (ActChgCrsSta+ 54) -#define ActRemFolDocCrs (ActChgCrsSta+ 55) -#define ActCopDocCrs (ActChgCrsSta+ 56) -#define ActPasDocCrs (ActChgCrsSta+ 57) -#define ActRemTreDocCrs (ActChgCrsSta+ 58) -#define ActFrmCreDocCrs (ActChgCrsSta+ 59) -#define ActCreFolDocCrs (ActChgCrsSta+ 60) -#define ActCreLnkDocCrs (ActChgCrsSta+ 61) -#define ActRenFolDocCrs (ActChgCrsSta+ 62) -#define ActRcvFilDocCrsDZ (ActChgCrsSta+ 63) -#define ActRcvFilDocCrsCla (ActChgCrsSta+ 64) -#define ActExpAdmDocCrs (ActChgCrsSta+ 65) -#define ActConAdmDocCrs (ActChgCrsSta+ 66) -#define ActZIPAdmDocCrs (ActChgCrsSta+ 67) -#define ActShoDocCrs (ActChgCrsSta+ 68) -#define ActHidDocCrs (ActChgCrsSta+ 69) -#define ActReqDatAdmDocCrs (ActChgCrsSta+ 70) -#define ActChgDatAdmDocCrs (ActChgCrsSta+ 71) -#define ActDowAdmDocCrs (ActChgCrsSta+ 72) +#define ActAdmDocCrs (ActChgCrsSta+ 53) +#define ActReqRemFilDocCrs (ActChgCrsSta+ 54) +#define ActRemFilDocCrs (ActChgCrsSta+ 55) +#define ActRemFolDocCrs (ActChgCrsSta+ 56) +#define ActCopDocCrs (ActChgCrsSta+ 57) +#define ActPasDocCrs (ActChgCrsSta+ 58) +#define ActRemTreDocCrs (ActChgCrsSta+ 59) +#define ActFrmCreDocCrs (ActChgCrsSta+ 60) +#define ActCreFolDocCrs (ActChgCrsSta+ 61) +#define ActCreLnkDocCrs (ActChgCrsSta+ 62) +#define ActRenFolDocCrs (ActChgCrsSta+ 63) +#define ActRcvFilDocCrsDZ (ActChgCrsSta+ 64) +#define ActRcvFilDocCrsCla (ActChgCrsSta+ 65) +#define ActExpAdmDocCrs (ActChgCrsSta+ 66) +#define ActConAdmDocCrs (ActChgCrsSta+ 67) +#define ActZIPAdmDocCrs (ActChgCrsSta+ 68) +#define ActShoDocCrs (ActChgCrsSta+ 69) +#define ActHidDocCrs (ActChgCrsSta+ 70) +#define ActReqDatAdmDocCrs (ActChgCrsSta+ 71) +#define ActChgDatAdmDocCrs (ActChgCrsSta+ 72) +#define ActDowAdmDocCrs (ActChgCrsSta+ 73) -#define ActAdmDocGrp (ActChgCrsSta+ 73) -#define ActReqRemFilDocGrp (ActChgCrsSta+ 74) -#define ActRemFilDocGrp (ActChgCrsSta+ 75) -#define ActRemFolDocGrp (ActChgCrsSta+ 76) -#define ActCopDocGrp (ActChgCrsSta+ 77) -#define ActPasDocGrp (ActChgCrsSta+ 78) -#define ActRemTreDocGrp (ActChgCrsSta+ 79) -#define ActFrmCreDocGrp (ActChgCrsSta+ 80) -#define ActCreFolDocGrp (ActChgCrsSta+ 81) -#define ActCreLnkDocGrp (ActChgCrsSta+ 82) -#define ActRenFolDocGrp (ActChgCrsSta+ 83) -#define ActRcvFilDocGrpDZ (ActChgCrsSta+ 84) -#define ActRcvFilDocGrpCla (ActChgCrsSta+ 85) -#define ActExpAdmDocGrp (ActChgCrsSta+ 86) -#define ActConAdmDocGrp (ActChgCrsSta+ 87) -#define ActZIPAdmDocGrp (ActChgCrsSta+ 88) -#define ActShoDocGrp (ActChgCrsSta+ 89) -#define ActHidDocGrp (ActChgCrsSta+ 90) -#define ActReqDatAdmDocGrp (ActChgCrsSta+ 91) -#define ActChgDatAdmDocGrp (ActChgCrsSta+ 92) -#define ActDowAdmDocGrp (ActChgCrsSta+ 93) +#define ActAdmDocGrp (ActChgCrsSta+ 74) +#define ActReqRemFilDocGrp (ActChgCrsSta+ 75) +#define ActRemFilDocGrp (ActChgCrsSta+ 76) +#define ActRemFolDocGrp (ActChgCrsSta+ 77) +#define ActCopDocGrp (ActChgCrsSta+ 78) +#define ActPasDocGrp (ActChgCrsSta+ 79) +#define ActRemTreDocGrp (ActChgCrsSta+ 80) +#define ActFrmCreDocGrp (ActChgCrsSta+ 81) +#define ActCreFolDocGrp (ActChgCrsSta+ 82) +#define ActCreLnkDocGrp (ActChgCrsSta+ 83) +#define ActRenFolDocGrp (ActChgCrsSta+ 84) +#define ActRcvFilDocGrpDZ (ActChgCrsSta+ 85) +#define ActRcvFilDocGrpCla (ActChgCrsSta+ 86) +#define ActExpAdmDocGrp (ActChgCrsSta+ 87) +#define ActConAdmDocGrp (ActChgCrsSta+ 88) +#define ActZIPAdmDocGrp (ActChgCrsSta+ 89) +#define ActShoDocGrp (ActChgCrsSta+ 90) +#define ActHidDocGrp (ActChgCrsSta+ 91) +#define ActReqDatAdmDocGrp (ActChgCrsSta+ 92) +#define ActChgDatAdmDocGrp (ActChgCrsSta+ 93) +#define ActDowAdmDocGrp (ActChgCrsSta+ 94) -#define ActChgToAdmCom (ActChgCrsSta+ 94) +#define ActChgToAdmCom (ActChgCrsSta+ 95) -#define ActAdmComCrs (ActChgCrsSta+ 95) -#define ActReqRemFilComCrs (ActChgCrsSta+ 96) -#define ActRemFilComCrs (ActChgCrsSta+ 97) -#define ActRemFolComCrs (ActChgCrsSta+ 98) -#define ActCopComCrs (ActChgCrsSta+ 99) -#define ActPasComCrs (ActChgCrsSta+100) -#define ActRemTreComCrs (ActChgCrsSta+101) -#define ActFrmCreComCrs (ActChgCrsSta+102) -#define ActCreFolComCrs (ActChgCrsSta+103) -#define ActCreLnkComCrs (ActChgCrsSta+104) -#define ActRenFolComCrs (ActChgCrsSta+105) -#define ActRcvFilComCrsDZ (ActChgCrsSta+106) -#define ActRcvFilComCrsCla (ActChgCrsSta+107) -#define ActExpComCrs (ActChgCrsSta+108) -#define ActConComCrs (ActChgCrsSta+109) -#define ActZIPComCrs (ActChgCrsSta+110) -#define ActReqDatComCrs (ActChgCrsSta+111) -#define ActChgDatComCrs (ActChgCrsSta+112) -#define ActDowComCrs (ActChgCrsSta+113) +#define ActAdmComCrs (ActChgCrsSta+ 96) +#define ActReqRemFilComCrs (ActChgCrsSta+ 97) +#define ActRemFilComCrs (ActChgCrsSta+ 98) +#define ActRemFolComCrs (ActChgCrsSta+ 99) +#define ActCopComCrs (ActChgCrsSta+100) +#define ActPasComCrs (ActChgCrsSta+101) +#define ActRemTreComCrs (ActChgCrsSta+102) +#define ActFrmCreComCrs (ActChgCrsSta+103) +#define ActCreFolComCrs (ActChgCrsSta+104) +#define ActCreLnkComCrs (ActChgCrsSta+105) +#define ActRenFolComCrs (ActChgCrsSta+106) +#define ActRcvFilComCrsDZ (ActChgCrsSta+107) +#define ActRcvFilComCrsCla (ActChgCrsSta+108) +#define ActExpComCrs (ActChgCrsSta+109) +#define ActConComCrs (ActChgCrsSta+110) +#define ActZIPComCrs (ActChgCrsSta+111) +#define ActReqDatComCrs (ActChgCrsSta+112) +#define ActChgDatComCrs (ActChgCrsSta+113) +#define ActDowComCrs (ActChgCrsSta+114) -#define ActAdmComGrp (ActChgCrsSta+114) -#define ActReqRemFilComGrp (ActChgCrsSta+115) -#define ActRemFilComGrp (ActChgCrsSta+116) -#define ActRemFolComGrp (ActChgCrsSta+117) -#define ActCopComGrp (ActChgCrsSta+118) -#define ActPasComGrp (ActChgCrsSta+119) -#define ActRemTreComGrp (ActChgCrsSta+120) -#define ActFrmCreComGrp (ActChgCrsSta+121) -#define ActCreFolComGrp (ActChgCrsSta+122) -#define ActCreLnkComGrp (ActChgCrsSta+123) -#define ActRenFolComGrp (ActChgCrsSta+124) -#define ActRcvFilComGrpDZ (ActChgCrsSta+125) -#define ActRcvFilComGrpCla (ActChgCrsSta+126) -#define ActExpComGrp (ActChgCrsSta+127) -#define ActConComGrp (ActChgCrsSta+128) -#define ActZIPComGrp (ActChgCrsSta+129) -#define ActReqDatComGrp (ActChgCrsSta+130) -#define ActChgDatComGrp (ActChgCrsSta+131) -#define ActDowComGrp (ActChgCrsSta+132) +#define ActAdmComGrp (ActChgCrsSta+115) +#define ActReqRemFilComGrp (ActChgCrsSta+116) +#define ActRemFilComGrp (ActChgCrsSta+117) +#define ActRemFolComGrp (ActChgCrsSta+118) +#define ActCopComGrp (ActChgCrsSta+119) +#define ActPasComGrp (ActChgCrsSta+120) +#define ActRemTreComGrp (ActChgCrsSta+121) +#define ActFrmCreComGrp (ActChgCrsSta+122) +#define ActCreFolComGrp (ActChgCrsSta+123) +#define ActCreLnkComGrp (ActChgCrsSta+124) +#define ActRenFolComGrp (ActChgCrsSta+125) +#define ActRcvFilComGrpDZ (ActChgCrsSta+126) +#define ActRcvFilComGrpCla (ActChgCrsSta+127) +#define ActExpComGrp (ActChgCrsSta+128) +#define ActConComGrp (ActChgCrsSta+129) +#define ActZIPComGrp (ActChgCrsSta+130) +#define ActReqDatComGrp (ActChgCrsSta+131) +#define ActChgDatComGrp (ActChgCrsSta+132) +#define ActDowComGrp (ActChgCrsSta+133) -#define ActEdiBib (ActChgCrsSta+133) -#define ActEdiFAQ (ActChgCrsSta+134) -#define ActEdiCrsLnk (ActChgCrsSta+135) +#define ActEdiBib (ActChgCrsSta+134) +#define ActEdiFAQ (ActChgCrsSta+135) +#define ActEdiCrsLnk (ActChgCrsSta+136) -#define ActChgFrcReaCrsInf (ActChgCrsSta+136) -#define ActChgFrcReaTchGui (ActChgCrsSta+137) -#define ActChgFrcReaSylLec (ActChgCrsSta+138) -#define ActChgFrcReaSylPra (ActChgCrsSta+139) -#define ActChgFrcReaBib (ActChgCrsSta+140) -#define ActChgFrcReaFAQ (ActChgCrsSta+141) -#define ActChgFrcReaCrsLnk (ActChgCrsSta+142) +#define ActChgFrcReaCrsInf (ActChgCrsSta+137) +#define ActChgFrcReaTchGui (ActChgCrsSta+138) +#define ActChgFrcReaSylLec (ActChgCrsSta+139) +#define ActChgFrcReaSylPra (ActChgCrsSta+140) +#define ActChgFrcReaBib (ActChgCrsSta+141) +#define ActChgFrcReaFAQ (ActChgCrsSta+142) +#define ActChgFrcReaCrsLnk (ActChgCrsSta+143) -#define ActChgHavReaCrsInf (ActChgCrsSta+143) -#define ActChgHavReaTchGui (ActChgCrsSta+144) -#define ActChgHavReaSylLec (ActChgCrsSta+145) -#define ActChgHavReaSylPra (ActChgCrsSta+146) -#define ActChgHavReaBib (ActChgCrsSta+147) -#define ActChgHavReaFAQ (ActChgCrsSta+148) -#define ActChgHavReaCrsLnk (ActChgCrsSta+149) +#define ActChgHavReaCrsInf (ActChgCrsSta+144) +#define ActChgHavReaTchGui (ActChgCrsSta+145) +#define ActChgHavReaSylLec (ActChgCrsSta+146) +#define ActChgHavReaSylPra (ActChgCrsSta+147) +#define ActChgHavReaBib (ActChgCrsSta+148) +#define ActChgHavReaFAQ (ActChgCrsSta+149) +#define ActChgHavReaCrsLnk (ActChgCrsSta+150) -#define ActSelInfSrcCrsInf (ActChgCrsSta+150) -#define ActSelInfSrcTchGui (ActChgCrsSta+151) -#define ActSelInfSrcSylLec (ActChgCrsSta+152) -#define ActSelInfSrcSylPra (ActChgCrsSta+153) -#define ActSelInfSrcBib (ActChgCrsSta+154) -#define ActSelInfSrcFAQ (ActChgCrsSta+155) -#define ActSelInfSrcCrsLnk (ActChgCrsSta+156) -#define ActRcvURLCrsInf (ActChgCrsSta+157) -#define ActRcvURLTchGui (ActChgCrsSta+158) -#define ActRcvURLSylLec (ActChgCrsSta+159) -#define ActRcvURLSylPra (ActChgCrsSta+160) -#define ActRcvURLBib (ActChgCrsSta+161) -#define ActRcvURLFAQ (ActChgCrsSta+162) -#define ActRcvURLCrsLnk (ActChgCrsSta+163) -#define ActRcvPagCrsInf (ActChgCrsSta+164) -#define ActRcvPagTchGui (ActChgCrsSta+165) -#define ActRcvPagSylLec (ActChgCrsSta+166) -#define ActRcvPagSylPra (ActChgCrsSta+167) -#define ActRcvPagBib (ActChgCrsSta+168) -#define ActRcvPagFAQ (ActChgCrsSta+169) -#define ActRcvPagCrsLnk (ActChgCrsSta+170) -#define ActEditorCrsInf (ActChgCrsSta+171) -#define ActEditorTchGui (ActChgCrsSta+172) -#define ActEditorSylLec (ActChgCrsSta+173) -#define ActEditorSylPra (ActChgCrsSta+174) -#define ActEditorBib (ActChgCrsSta+175) -#define ActEditorFAQ (ActChgCrsSta+176) -#define ActEditorCrsLnk (ActChgCrsSta+177) -#define ActPlaTxtEdiCrsInf (ActChgCrsSta+178) -#define ActPlaTxtEdiTchGui (ActChgCrsSta+179) -#define ActPlaTxtEdiSylLec (ActChgCrsSta+180) -#define ActPlaTxtEdiSylPra (ActChgCrsSta+181) -#define ActPlaTxtEdiBib (ActChgCrsSta+182) -#define ActPlaTxtEdiFAQ (ActChgCrsSta+183) -#define ActPlaTxtEdiCrsLnk (ActChgCrsSta+184) -#define ActRchTxtEdiCrsInf (ActChgCrsSta+185) -#define ActRchTxtEdiTchGui (ActChgCrsSta+186) -#define ActRchTxtEdiSylLec (ActChgCrsSta+187) -#define ActRchTxtEdiSylPra (ActChgCrsSta+188) -#define ActRchTxtEdiBib (ActChgCrsSta+189) -#define ActRchTxtEdiFAQ (ActChgCrsSta+190) -#define ActRchTxtEdiCrsLnk (ActChgCrsSta+191) -#define ActRcvPlaTxtCrsInf (ActChgCrsSta+192) -#define ActRcvPlaTxtTchGui (ActChgCrsSta+193) -#define ActRcvPlaTxtSylLec (ActChgCrsSta+194) -#define ActRcvPlaTxtSylPra (ActChgCrsSta+195) -#define ActRcvPlaTxtBib (ActChgCrsSta+196) -#define ActRcvPlaTxtFAQ (ActChgCrsSta+197) -#define ActRcvPlaTxtCrsLnk (ActChgCrsSta+198) -#define ActRcvRchTxtCrsInf (ActChgCrsSta+199) -#define ActRcvRchTxtTchGui (ActChgCrsSta+200) -#define ActRcvRchTxtSylLec (ActChgCrsSta+201) -#define ActRcvRchTxtSylPra (ActChgCrsSta+202) -#define ActRcvRchTxtBib (ActChgCrsSta+203) -#define ActRcvRchTxtFAQ (ActChgCrsSta+204) -#define ActRcvRchTxtCrsLnk (ActChgCrsSta+205) +#define ActSelInfSrcCrsInf (ActChgCrsSta+151) +#define ActSelInfSrcTchGui (ActChgCrsSta+152) +#define ActSelInfSrcSylLec (ActChgCrsSta+153) +#define ActSelInfSrcSylPra (ActChgCrsSta+154) +#define ActSelInfSrcBib (ActChgCrsSta+155) +#define ActSelInfSrcFAQ (ActChgCrsSta+156) +#define ActSelInfSrcCrsLnk (ActChgCrsSta+157) +#define ActRcvURLCrsInf (ActChgCrsSta+158) +#define ActRcvURLTchGui (ActChgCrsSta+159) +#define ActRcvURLSylLec (ActChgCrsSta+160) +#define ActRcvURLSylPra (ActChgCrsSta+161) +#define ActRcvURLBib (ActChgCrsSta+162) +#define ActRcvURLFAQ (ActChgCrsSta+163) +#define ActRcvURLCrsLnk (ActChgCrsSta+164) +#define ActRcvPagCrsInf (ActChgCrsSta+165) +#define ActRcvPagTchGui (ActChgCrsSta+166) +#define ActRcvPagSylLec (ActChgCrsSta+167) +#define ActRcvPagSylPra (ActChgCrsSta+168) +#define ActRcvPagBib (ActChgCrsSta+169) +#define ActRcvPagFAQ (ActChgCrsSta+170) +#define ActRcvPagCrsLnk (ActChgCrsSta+171) +#define ActEditorCrsInf (ActChgCrsSta+172) +#define ActEditorTchGui (ActChgCrsSta+173) +#define ActEditorSylLec (ActChgCrsSta+174) +#define ActEditorSylPra (ActChgCrsSta+175) +#define ActEditorBib (ActChgCrsSta+176) +#define ActEditorFAQ (ActChgCrsSta+177) +#define ActEditorCrsLnk (ActChgCrsSta+178) +#define ActPlaTxtEdiCrsInf (ActChgCrsSta+179) +#define ActPlaTxtEdiTchGui (ActChgCrsSta+180) +#define ActPlaTxtEdiSylLec (ActChgCrsSta+181) +#define ActPlaTxtEdiSylPra (ActChgCrsSta+182) +#define ActPlaTxtEdiBib (ActChgCrsSta+183) +#define ActPlaTxtEdiFAQ (ActChgCrsSta+184) +#define ActPlaTxtEdiCrsLnk (ActChgCrsSta+185) +#define ActRchTxtEdiCrsInf (ActChgCrsSta+186) +#define ActRchTxtEdiTchGui (ActChgCrsSta+187) +#define ActRchTxtEdiSylLec (ActChgCrsSta+188) +#define ActRchTxtEdiSylPra (ActChgCrsSta+189) +#define ActRchTxtEdiBib (ActChgCrsSta+190) +#define ActRchTxtEdiFAQ (ActChgCrsSta+191) +#define ActRchTxtEdiCrsLnk (ActChgCrsSta+192) +#define ActRcvPlaTxtCrsInf (ActChgCrsSta+193) +#define ActRcvPlaTxtTchGui (ActChgCrsSta+194) +#define ActRcvPlaTxtSylLec (ActChgCrsSta+195) +#define ActRcvPlaTxtSylPra (ActChgCrsSta+196) +#define ActRcvPlaTxtBib (ActChgCrsSta+197) +#define ActRcvPlaTxtFAQ (ActChgCrsSta+198) +#define ActRcvPlaTxtCrsLnk (ActChgCrsSta+199) +#define ActRcvRchTxtCrsInf (ActChgCrsSta+200) +#define ActRcvRchTxtTchGui (ActChgCrsSta+201) +#define ActRcvRchTxtSylLec (ActChgCrsSta+202) +#define ActRcvRchTxtSylPra (ActChgCrsSta+203) +#define ActRcvRchTxtBib (ActChgCrsSta+204) +#define ActRcvRchTxtFAQ (ActChgCrsSta+205) +#define ActRcvRchTxtCrsLnk (ActChgCrsSta+206) /*****************************************************************************/ /***************************** Assessment tab ********************************/ diff --git a/swad_changelog.h b/swad_changelog.h index ab8c74c9..42109491 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -35,11 +35,15 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 14.45 (2014/12/27)" +#define Log_PLATFORM_VERSION "SWAD 14.46 (2014/12/28)" // 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.46 :Dic 28, 2014 Course syllabus are shown in one unique option. (174340 lines) + 1 change necessary in database: +INSERT INTO actions (ActCod,Language,Obsolete,Txt) VALUES ('1242','es','N','Ver programa'); + 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) diff --git a/swad_global.c b/swad_global.c index 0bbb8018..ddddede4 100644 --- a/swad_global.c +++ b/swad_global.c @@ -348,7 +348,7 @@ void Gbl_InitializeGlobals (void) Gbl.CurrentCrs.Records.LstFields.NestedCalls = 0; Gbl.CurrentCrs.Syllabus.EditionIsActive = false; - Gbl.CurrentCrs.Syllabus.WhichSyllabus = Syl_LECTURES; + Gbl.CurrentCrs.Syllabus.WhichSyllabus = Syl_DEFAULT_WHICH_SYLLABUS; Gbl.Search.WhatToSearch = Sch_SEARCH_ALL; Gbl.Search.Str[0] = '\0'; diff --git a/swad_info.c b/swad_info.c index 00ddddef..4d2152ef 100644 --- a/swad_info.c +++ b/swad_info.c @@ -547,8 +547,7 @@ void Inf_WriteMsgYouMustReadInfo (void) Lay_ShowAlert (Lay_WARNING,Gbl.Message); /***** Write every information I must read *****/ - fprintf (Gbl.F.Out,"
" - "" + fprintf (Gbl.F.Out,"
" "" "" "" - "
" "
    "); @@ -560,7 +559,8 @@ void Inf_WriteMsgYouMustReadInfo (void) fprintf (Gbl.F.Out,"
  • "); Act_FormStart (Inf_ActionsSeeInfo[InfoType]); Act_LinkFormSubmit (Act_GetTitleAction (Inf_ActionsSeeInfo[InfoType]),The_ClassFormul[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s" + fprintf (Gbl.F.Out,"%s" + "" "" "
    • ", Act_GetTitleAction (Inf_ActionsSeeInfo[InfoType])); @@ -568,8 +568,7 @@ void Inf_WriteMsgYouMustReadInfo (void) fprintf (Gbl.F.Out,"
" "
" - "
"); + ""); } /*****************************************************************************/ @@ -1159,6 +1158,10 @@ Inf_InfoType_t Inf_AsignInfoType (void) case ActRcvPlaTxtTchGui: case ActRcvRchTxtTchGui: return Inf_TEACHING_GUIDE; + case ActSeeSyl: + Syl_GetParamWhichSyllabus (); + return (Gbl.CurrentCrs.Syllabus.WhichSyllabus == Syl_LECTURES ? Inf_LECTURES : + Inf_PRACTICALS); case ActSeeSylLec: case ActEdiSylLec: case ActChgFrcReaSylLec: @@ -1171,6 +1174,7 @@ Inf_InfoType_t Inf_AsignInfoType (void) case ActRchTxtEdiSylLec: case ActRcvPlaTxtSylLec: case ActRcvRchTxtSylLec: + Gbl.CurrentCrs.Syllabus.WhichSyllabus = Syl_LECTURES; return Inf_LECTURES; case ActSeeSylPra: case ActEdiSylPra: @@ -1184,6 +1188,7 @@ Inf_InfoType_t Inf_AsignInfoType (void) case ActRchTxtEdiSylPra: case ActRcvPlaTxtSylPra: case ActRcvRchTxtSylPra: + Gbl.CurrentCrs.Syllabus.WhichSyllabus = Syl_PRACTICALS; return Inf_PRACTICALS; case ActSeeBib: case ActEdiBib: @@ -1315,7 +1320,8 @@ void Inf_GetInfoSrcFromDB (long CrsCod,Inf_InfoType_t InfoType,Inf_InfoSrc_t *In /***** Get info source for a specific type of course information (bibliography, FAQ, links or evaluation) from database *****/ - sprintf (Query,"SELECT InfoSrc,MustBeRead FROM crs_info_src WHERE CrsCod='%ld' AND InfoType='%s'", + sprintf (Query,"SELECT InfoSrc,MustBeRead FROM crs_info_src" + " WHERE CrsCod='%ld' AND InfoType='%s'", CrsCod,Inf_NamesInDBForInfoType[InfoType]); NumRows = DB_QuerySELECT (Query,&mysql_res,"can not get info source"); diff --git a/swad_syllabus.c b/swad_syllabus.c index 0e2c96ab..50ea9993 100644 --- a/swad_syllabus.c +++ b/swad_syllabus.c @@ -107,6 +107,23 @@ 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); +/*****************************************************************************/ +/******************** Get parameter to select a syllabus *********************/ +/*****************************************************************************/ + +void Syl_GetParamWhichSyllabus (void) + { + char UnsignedStr[10+1]; + unsigned UnsignedNum; + + /***** Get which syllabus I want to see *****/ + Par_GetParToText ("WhichSyllabus",UnsignedStr,10); + if (sscanf (UnsignedStr,"%u",&UnsignedNum) == 1) + Gbl.CurrentCrs.Syllabus.WhichSyllabus = (Syl_WhichSyllabus_t) UnsignedNum; + else + Gbl.CurrentCrs.Syllabus.WhichSyllabus = Syl_DEFAULT_WHICH_SYLLABUS; + } + /*****************************************************************************/ /************************ Write form to select syllabus **********************/ /*****************************************************************************/ @@ -118,7 +135,8 @@ void Syl_PutFormWhichSyllabus (void) /***** 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,"
"); + Act_FormStart (ActSeeSyl); fprintf (Gbl.F.Out,"
"); } /*****************************************************************************/ @@ -223,8 +242,12 @@ static Inf_InfoType_t Syl_SetSyllabusTypeAndLoadToMemory (void) /***** Set the type of syllabus (lectures or practicals) *****/ switch (Gbl.CurrentAct) { + case ActSeeSyl: + InfoType = (Gbl.CurrentCrs.Syllabus.WhichSyllabus == Syl_LECTURES ? Inf_LECTURES : + Inf_PRACTICALS); + break; case ActSeeSylLec: - case ActEditorSylLec: + case ActEdiSylLec: case ActDelItmSylLec: case ActUp_IteSylLec: case ActDwnIteSylLec: @@ -232,11 +255,21 @@ static Inf_InfoType_t Syl_SetSyllabusTypeAndLoadToMemory (void) case ActLftIteSylLec: case ActInsIteSylLec: case ActModIteSylLec: - case ActEdiSylLec: + case ActChgFrcReaSylLec: + case ActChgHavReaSylLec: + case ActSelInfSrcSylLec: + case ActRcvURLSylLec: + case ActRcvPagSylLec: + case ActEditorSylLec: + case ActPlaTxtEdiSylLec: + case ActRchTxtEdiSylLec: + case ActRcvPlaTxtSylLec: + case ActRcvRchTxtSylLec: + Gbl.CurrentCrs.Syllabus.WhichSyllabus = Syl_LECTURES; InfoType = Inf_LECTURES; break; case ActSeeSylPra: - case ActEditorSylPra: + case ActEdiSylPra: case ActDelItmSylPra: case ActUp_IteSylPra: case ActDwnIteSylPra: @@ -244,7 +277,17 @@ static Inf_InfoType_t Syl_SetSyllabusTypeAndLoadToMemory (void) case ActLftIteSylPra: case ActInsIteSylPra: case ActModIteSylPra: - case ActEdiSylPra: + case ActChgFrcReaSylPra: + case ActChgHavReaSylPra: + case ActSelInfSrcSylPra: + case ActRcvURLSylPra: + case ActRcvPagSylPra: + case ActEditorSylPra: + case ActPlaTxtEdiSylPra: + case ActRchTxtEdiSylPra: + case ActRcvPlaTxtSylPra: + case ActRcvRchTxtSylPra: + Gbl.CurrentCrs.Syllabus.WhichSyllabus = Syl_PRACTICALS; InfoType = Inf_PRACTICALS; break; default: diff --git a/swad_syllabus.h b/swad_syllabus.h index 5d5eca2d..f24bfc22 100644 --- a/swad_syllabus.h +++ b/swad_syllabus.h @@ -37,6 +37,7 @@ typedef enum Syl_LECTURES = 0, Syl_PRACTICALS = 1, } Syl_WhichSyllabus_t; // Which syllabus I want to see +#define Syl_DEFAULT_WHICH_SYLLABUS Syl_LECTURES typedef enum { @@ -64,6 +65,7 @@ struct MoveSubtrees /***************************** Public prototypes *****************************/ /*****************************************************************************/ +void Syl_GetParamWhichSyllabus (void); void Syl_PutFormWhichSyllabus (void); void Syl_GetParamItemNumber (void); diff --git a/swad_text.c b/swad_text.c index e3dc6cea..1273bb39 100644 --- a/swad_text.c +++ b/swad_text.c @@ -16271,46 +16271,25 @@ const char *Txt_MENU_BR[Act_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] = "Guia
de ensino" #endif , - // ActSeeSylLec + // ActSeeSyl #if L==0 - "Programa
teoria" + "Programa" #elif L==1 - "Studienplan
(Vorlesungen)" + "Studienplan" #elif L==2 - "Syllabus
(lectures)" + "Syllabus" #elif L==3 - "Programa
teoría" + "Programa" #elif L==4 - "Plan
théorie" + "Plan" #elif L==5 - "Programa
teoría" // Okoteve traducción + "Programa" // Okoteve traducción #elif L==6 - "Programma
teoria" + "Programma" #elif L==7 - "Program
(wyklady)" + "Program" #elif L==8 - "Programa
teoria" -#endif - , - // ActSeeSylPra -#if L==0 - "Programa
pràctiques" -#elif L==1 - "Studienplan
(Übungen)" -#elif L==2 - "Syllabus
(practicals)" -#elif L==3 - "Programa
prácticas" -#elif L==4 - "Plan
pratique" -#elif L==5 - "Programa
prácticas" // Okoteve traducción -#elif L==6 - "Programma
pratica" -#elif L==7 - "Program
(praktyczny)" -#elif L==8 - "Programa
prática" + "Programa" #endif , // ActSeeDoc @@ -16467,6 +16446,7 @@ const char *Txt_MENU_BR[Act_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] = NULL, NULL, NULL, + NULL, }, { // TabAss ***************************************************** @@ -18185,46 +18165,25 @@ const char *Txt_MENU_NO_BR[Act_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] = "Guia de ensino" #endif , - // ActSeeSylLec + // ActSeeSyl #if L==0 - "Programa teoria" + "Programa" #elif L==1 - "Studienplan (Vorlesungen)" + "Studienplan" #elif L==2 - "Syllabus (lectures)" + "Syllabus" #elif L==3 - "Programa teoría" + "Programa" #elif L==4 - "Plan théorie" + "Plan" #elif L==5 - "Programa teoría" // Okoteve traducción + "Programa" // Okoteve traducción #elif L==6 - "Programma teoria" + "Programma" #elif L==7 - "Syllabus (wyklady)" + "Syllabus" #elif L==8 - "Programa teoria" -#endif - , - // ActSeeSylPra -#if L==0 - "Programa pràctiques" -#elif L==1 - "Studienplan (Übungen)" -#elif L==2 - "Syllabus (practicals)" -#elif L==3 - "Programa prácticas" -#elif L==4 - "Plan pratique" -#elif L==5 - "Programa prácticas" // Okoteve traducción -#elif L==6 - "Programma pratica" -#elif L==7 - "Syllabus (practicals)" -#elif L==8 - "Programa prática" + "Programa" #endif , // ActSeeDoc @@ -18381,6 +18340,7 @@ const char *Txt_MENU_NO_BR[Act_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] = NULL, NULL, NULL, + NULL, }, { // TabAss ***************************************************** @@ -20103,46 +20063,25 @@ const char *Txt_MENU_SUBTITLE[Act_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] = "Guia de ensino" #endif , - // ActSeeSylLec + // ActSeeSyl #if L==0 - "Programa de teoria de l'assignatura" + "Programa de l'assignatura" #elif L==1 - "Studienplan (Vorlesungen)" + "Studienplan" #elif L==2 - "Syllabus (lectures)" + "Syllabus" #elif L==3 - "Programa de teoría de la asignatura" + "Programa de la asignatura" #elif L==4 - "Plan théorie" + "Plan" #elif L==5 - "Programa de teoría de la asignatura"// Okoteve traducción + "Programa de la asignatura"// Okoteve traducción #elif L==6 - "Programma teoria" + "Programma" #elif L==7 - "Syllabus (wyklady)" + "Syllabus" #elif L==8 - "Programa teoria" -#endif - , - // ActSeeSylPra -#if L==0 - "Programa de pràctiques de l'assignatura" -#elif L==1 - "Studienplan (Übungen)" -#elif L==2 - "Syllabus (practicals)" -#elif L==3 - "Programa de prácticas de la asignatura" -#elif L==4 - "Plan pratique" -#elif L==5 - "Programa de prácticas de la asignatura" // Okoteve traducción -#elif L==6 - "Programma pratica" -#elif L==7 - "Syllabus (practicals)" -#elif L==8 - "Programa prática" + "Programa" #endif , // ActSeeDoc @@ -20306,6 +20245,7 @@ const char *Txt_MENU_SUBTITLE[Act_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] = NULL, NULL, NULL, + NULL, }, { // TabAss ***************************************************** @@ -38197,7 +38137,7 @@ const char *Txt_Syllabus_of_the_course = "Programa da disciplina"; #endif -extern const char *Txt_SYLLABUS_WHICH_SYLLABUS[Syl_NUM_WHICH_SYLLABUS] = +const char *Txt_SYLLABUS_WHICH_SYLLABUS[Syl_NUM_WHICH_SYLLABUS] = { // Lectures #if L==0 @@ -38222,23 +38162,23 @@ extern const char *Txt_SYLLABUS_WHICH_SYLLABUS[Syl_NUM_WHICH_SYLLABUS] = , // Practicals #if L==0 - "Pràct." + "Pràctiques" #elif L==1 "Übung" #elif L==2 "Practicals" #elif L==3 - "Práct." + "Prácticas" #elif L==4 "Pratique" #elif L==5 - "Práct." // Okoteve traducción + "Prácticas" // Okoteve traducción #elif L==6 "Pratica" #elif L==7 - "praktyki" + "Praktyki" #elif L==8 - "Práct." + "Prática" #endif , };