Version19.139

swad_action.c

@@ -408,8 +408,8 @@ const struct Act_Actions Act_Actions[Act_NUM_ACTIONS] =
    [ActShoPrgItm	] = {1830,-1,TabUnk,ActSeePrg		,0x220,0x200,    0,    0,    0,    0,    0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL				,Prg_ShowPrgItem		,NULL},
    [ActUp_PrgItm	] = {1831,-1,TabUnk,ActSeePrg		,0x220,0x200,    0,    0,    0,    0,    0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL				,Prg_MoveUpPrgItem		,NULL},
    [ActDwnPrgItm	] = {1832,-1,TabUnk,ActSeePrg		,0x220,0x200,    0,    0,    0,    0,    0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL				,Prg_MoveDownPrgItem		,NULL},
-   [ActRgtPrgItm	] = {1833,-1,TabUnk,ActSeePrg		,0x220,0x200,    0,    0,    0,    0,    0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL				,Prg_MoveRightPrgItem		,NULL},
    [ActLftPrgItm	] = {1834,-1,TabUnk,ActSeePrg		,0x220,0x200,    0,    0,    0,    0,    0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL				,Prg_MoveLeftPrgItem		,NULL},
+   [ActRgtPrgItm	] = {1833,-1,TabUnk,ActSeePrg		,0x220,0x200,    0,    0,    0,    0,    0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL				,Prg_MoveRightPrgItem		,NULL},
 
    [ActEdiTchGui	] = { 785,-1,TabUnk,ActSeeTchGui	,0x220,0x200,    0,    0,    0,    0,    0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL				,Inf_FormsToSelSendInfo		,NULL},
 

swad_action.h

@@ -394,8 +394,8 @@ typedef signed int Act_Action_t;	// Must be a signed type, because -1 is used to
 #define ActShoPrgItm		(ActChgCrsSta +  23)
 #define ActUp_PrgItm		(ActChgCrsSta +  24)
 #define ActDwnPrgItm		(ActChgCrsSta +  25)
-#define ActRgtPrgItm		(ActChgCrsSta +  26)
-#define ActLftPrgItm		(ActChgCrsSta +  27)
+#define ActLftPrgItm		(ActChgCrsSta +  26)
+#define ActRgtPrgItm		(ActChgCrsSta +  27)
 #define ActEdiTchGui		(ActChgCrsSta +  28)
 #define ActSeeSylLec		(ActChgCrsSta +  29)
 #define ActSeeSylPra		(ActChgCrsSta +  30)

swad_changelog.h

@@ -497,7 +497,7 @@ enscript -2 --landscape --color --file-align=2 --highlight --line-numbers -o - *
 En OpenSWAD:
 ps2pdf source.ps destination.pdf
 */
-#define Log_PLATFORM_VERSION	"SWAD 19.138.1 (2020-02-29)"
+#define Log_PLATFORM_VERSION	"SWAD 19.139 (2020-03-02)"
 #define CSS_FILE		"swad19.136.css"
 #define JS_FILE			"swad19.91.1.js"
 /*
@@ -523,7 +523,7 @@ Param
 // TODO: Miguel Damas: por defecto, marcar "Permitir que los profesores..." en los test (que ya esté marcado en lugar de desmarcado)
 // TODO: Si el alumno ha marcado "Permitir que los profesores...", entonces pedir confirmación al pulsar el botón azul, para evitar que se envíe por error antes de tiempo
 
-	Version 19.138.2: Feb 29, 2020	Check if arrows are correct (move up is wring). (? lines)
+	Version 19.139:   Mar 02, 2020	Changes in course program. (282252 lines)
 	Version 19.138.1: Feb 29, 2020	Fixed bugs in course program. (282252 lines)
 	Version 19.138:   Feb 29, 2020	Move subtrees up and down in course program. (282230 lines)
 	Version 19.137:   Feb 29, 2020	Removed pagination in course program. (282305 lines)

swad_global.c

@@ -299,7 +299,7 @@ void Gbl_InitializeGlobals (void)
 
    Gbl.Prg.LstIsRead = false;	// List is not read
    Gbl.Prg.Num = 0;
-   Gbl.Prg.LstItmCods = NULL;
+   Gbl.Prg.LstItems = NULL;
 
    Gbl.Asgs.LstIsRead = false;	// List is not read
    Gbl.Asgs.Num = 0;

swad_global.h

@@ -540,13 +540,15 @@ struct Globals
      } FileBrowser;	// Struct used for a file browser
    struct
      {
-      bool LstIsRead;		// Is the list already read from database, or it needs to be read?
-      unsigned Num;		// Number of items
-      long *LstItmCods;		// List of items codes
+      bool LstIsRead;		// Is the list already read from database...
+				// ...or it needs to be read?
+      unsigned Num;				// Number of items
+      struct ProgramItemHierarchy *LstItems;	// List of items
      } Prg;
    struct
      {
-      bool LstIsRead;		// Is the list already read from database, or it needs to be read?
+      bool LstIsRead;		// Is the list already read from database...
+				// ...or it needs to be read?
       unsigned Num;		// Number of assignments
       long *LstAsgCods;		// List of assigment codes
       Dat_StartEndTime_t SelectedOrder;

swad_program.h

@@ -39,12 +39,18 @@
 #define Prg_MAX_CHARS_PROGRAM_ITEM_TITLE	(128 - 1)	// 127
 #define Prg_MAX_BYTES_PROGRAM_ITEM_TITLE	((Prg_MAX_CHARS_PROGRAM_ITEM_TITLE + 1) * Str_MAX_BYTES_PER_CHAR - 1)	// 2047
 
-struct ProgramItem
+struct ProgramItemHierarchy
   {
    long ItmCod;
    unsigned Index;
    unsigned Level;
    bool Hidden;
+  };
+
+struct ProgramItem
+  {
+   struct ProgramItemHierarchy Hierarchy;
+   bool Hidden;
    long UsrCod;
    time_t TimeUTC[Dat_NUM_START_END_TIME];
    bool Open;
@@ -64,7 +70,6 @@ struct ProgramItem
 void Prg_SeeCourseProgram (void);
 
 void Prg_RequestCreatOrEditPrgItem (void);
-void Prg_GetListPrgItems (void);
 void Prg_GetDataOfItemByCod (struct ProgramItem *PrgItem);
 void Prg_FreeListItems (void);
 
@@ -77,8 +82,8 @@ void Prg_ShowPrgItem (void);
 
 void Prg_MoveUpPrgItem (void);
 void Prg_MoveDownPrgItem (void);
-void Prg_MoveRightPrgItem (void);
 void Prg_MoveLeftPrgItem (void);
+void Prg_MoveRightPrgItem (void);
 
 void Prg_RecFormPrgItem (void);
 bool Prg_CheckIfItemIsAssociatedToGrp (long PrgItmCod,long GrpCod);

swad_text_action.c

@@ -4997,15 +4997,15 @@ const char *Txt_Actions[Act_NUM_ACTIONS] =
 	""			// Precisa de tradução
 #endif
 	,
-	[ActRgtPrgItm] =
+	[ActLftPrgItm] =
 #if   L==1	// ca
 	""			// Necessita traducció
 #elif L==2	// de
 	""			// Need Übersetzung
 #elif L==3	// en
-	"Move right program item"
+	"Move left program item"
 #elif L==4	// es
-	"Mover a la derecha ítem del programa"
+	"Mover a la izquierda ítem del programa"
 #elif L==5	// fr
 	""			// Besoin de traduction
 #elif L==6	// gn
@@ -5018,15 +5018,15 @@ const char *Txt_Actions[Act_NUM_ACTIONS] =
 	""			// Precisa de tradução
 #endif
 	,
-	[ActLftPrgItm] =
+	[ActRgtPrgItm] =
 #if   L==1	// ca
 	""			// Necessita traducció
 #elif L==2	// de
 	""			// Need Übersetzung
 #elif L==3	// en
-	"Move left program item"
+	"Move right program item"
 #elif L==4	// es
-	"Mover a la izquierda ítem del programa"
+	"Mover a la derecha ítem del programa"
 #elif L==5	// fr
 	""			// Besoin de traduction
 #elif L==6	// gn