Version 17.20.2

swad_action.c

@@ -1999,7 +1999,7 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] =
    /* ActRemTutPrj	*/{1694,-1,TabUnk,ActSeePrj		,0x230,0x200,    0,    0,    0,    0,    0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL				,Prj_RemTut			,NULL},
    /* ActRemEvaPrj	*/{1695,-1,TabUnk,ActSeePrj		,0x230,0x200,    0,    0,    0,    0,    0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL				,Prj_RemEva			,NULL},
 
-   /* ActAdmDocPrj	*/{1697,-1,TabUnk,ActSeePrj		,0x238,0x200,    0,    0,    0,    0,    0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL				,Prj_FileBrowserPrj		,NULL},
+   /* ActAdmDocPrj	*/{1697,-1,TabUnk,ActSeePrj		,0x238,0x200,    0,    0,    0,    0,    0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL				,Brw_ShowFileBrowserOrWorks	,NULL},
    /* ActReqRemFilDocPrj*/{1698,-1,TabUnk,ActSeePrj		,0x238,0x200,    0,    0,    0,    0,    0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL				,Brw_AskRemFileFromTree		,NULL},
    /* ActRemFilDocPrj	*/{1699,-1,TabUnk,ActSeePrj		,0x238,0x200,    0,    0,    0,    0,    0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL				,Brw_RemFileFromTree		,NULL},
    /* ActRemFolDocPrj	*/{1700,-1,TabUnk,ActSeePrj		,0x238,0x200,    0,    0,    0,    0,    0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL				,Brw_RemFolderFromTree		,NULL},

swad_changelog.h

@@ -256,14 +256,15 @@
 /****************************** Public constants *****************************/
 /*****************************************************************************/
 
-#define Log_PLATFORM_VERSION	"SWAD 17.20.1 (2017-10-07)"
+#define Log_PLATFORM_VERSION	"SWAD 17.20.2 (2017-10-07)"
 #define CSS_FILE		"swad17.0.css"
 #define JS_FILE			"swad17.17.1.js"
 
 // 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 sql/swad*.sql | tail -1
 /*
-        Version 17.20.1:  Oct 07, 2017  Fixed bug in file browser clipboard. (? lines)
+        Version 17.20.2:  Oct 07, 2017  Fixed bugs and changes in layout of project file browser. (232960 lines)
+        Version 17.20.1:  Oct 07, 2017  Fixed bug in file browser clipboard. (232938 lines)
         Version 17.20:    Oct 06, 2017  New file browser for project documents. Not finished. (232915 lines)
 					18 changes necessary in database:
 INSERT INTO actions (ActCod,Language,Obsolete,Txt) VALUES ('1698','es','N','Subir archivo a docs. proyecto (ant.)');

swad_file_browser.c

@@ -2340,6 +2340,8 @@ void Brw_GetParAndInitFileBrowser (void)
       case ActCreFolAsgUsr:	case ActRenFolAsgUsr:
       case ActCreFolWrkUsr:	case ActRenFolWrkUsr:
 
+      case ActCreFolDocPrj:	case ActRenFolDocPrj:
+
       case ActCreFolBrf:	case ActRenFolBrf:
 	 /* Get the name of the new folder */
 	 Par_GetParToText ("NewFolderName",Gbl.FileBrowser.NewFilFolLnkName,NAME_MAX);
@@ -2357,6 +2359,7 @@ void Brw_GetParAndInitFileBrowser (void)
       case ActCreLnkWrkCrs:
       case ActCreLnkAsgUsr:
       case ActCreLnkWrkUsr:
+      case ActCreLnkDocPrj:
       case ActCreLnkBrf:
 	 /* Get the name of the new link */
 	 Par_GetParToText ("NewLinkName",Gbl.FileBrowser.NewFilFolLnkName,NAME_MAX);
@@ -3342,6 +3345,42 @@ static void Brw_ShowFileBrowserNormal (void)
    Brw_ShowFileBrowser ();
   }
 
+/*****************************************************************************/
+/************* Show file browser with the documents of a project *************/
+/*****************************************************************************/
+
+static void Brw_ShowFileBrowserProject (void)
+  {
+   extern const char *Hlp_ASSESSMENT_Projects;
+   struct Project Prj;
+
+   /***** Allocate memory for the project *****/
+   Prj_AllocMemProject (&Prj);
+
+   /***** Get project data *****/
+   Prj.PrjCod = Prj_GetParamPrjCod ();
+   Prj_GetDataOfProjectByCod (&Prj);
+
+   /***** Start box *****/
+   Box_StartBox (NULL,Prj.Title,NULL,
+		 Hlp_ASSESSMENT_Projects,Box_NOT_CLOSABLE);
+
+   /***** Show the project *****/
+   Prj_ShowOneUniqueProject (&Prj);
+
+   /***** Write top before showing file browser *****/
+   Brw_WriteTopBeforeShowingFileBrowser ();
+
+   /***** Show the file browser *****/
+   Brw_ShowFileBrowser ();
+
+   /***** End box *****/
+   Box_EndBox ();
+
+   /***** Free memory of the project *****/
+   Prj_FreeMemProject (&Prj);
+  }
+
 /*****************************************************************************/
 /*** Show file browsers with works files of several users of current course **/
 /*****************************************************************************/
@@ -3650,6 +3689,8 @@ void Brw_ShowAgainFileBrowserOrWorks (void)
       Brw_ShowFileBrowsersAsgWrkUsr ();
    else if (Brw_GetIfCrsAssigWorksFileBrowser ())
       Brw_ShowFileBrowsersAsgWrkCrs ();
+   else if (Brw_GetIfProjectFileBrowser ())
+      Brw_ShowFileBrowserProject ();
    else
       Brw_ShowFileBrowserNormal ();
 
@@ -7339,6 +7380,8 @@ static long Brw_GetCodForClipboard (void)
       case Brw_ADMI_SHARE_GRP:
       case Brw_ADMI_MARKS_GRP:
 	 return Gbl.CurrentCrs.Grps.GrpCod;
+      case Brw_ADMI_DOCUM_PRJ:
+	 return Gbl.CurrentCrs.Prjs.PrjCod;
       default:
          return -1L;
      }

swad_project.c

@@ -553,35 +553,19 @@ static void Prj_PutIconToShowAllData (void)
 /***************** View / edit file browser of one project *******************/
 /*****************************************************************************/
 
-void Prj_FileBrowserPrj (void)
+void Prj_ShowOneUniqueProject (struct Project *Prj)
   {
-   extern const char *Hlp_ASSESSMENT_Projects;
+   /***** Start table *****/
-   struct Project Prj;
+   Tbl_StartTableWide (2);
 
-   /***** Allocate memory for the project *****/
+   /***** Write project head *****/
-   Prj_AllocMemProject (&Prj);
-
-   /***** Get project data *****/
-   Prj.PrjCod = Prj_GetParamPrjCod ();
-   Prj_GetDataOfProjectByCod (&Prj);
-
-   /***** Start box and table *****/
-   Box_StartBoxTable (NULL,Prj.Title,NULL,
-		      Hlp_ASSESSMENT_Projects,Box_NOT_CLOSABLE,2);
    Prj_ShowProjectsHead (true);	// Print view
 
-   /***** Write project *****/
+   /***** Show project *****/
-   Prj_ShowOneProject (&Prj,Prj_FILE_BROWSER_PROJECT);
+   Prj_ShowOneProject (Prj,Prj_FILE_BROWSER_PROJECT);
 
-   /***** End box *****/
+   /***** End table *****/
-   Box_EndBoxTable ();
+   Tbl_EndTable ();
-
-   /***** Free memory of the project *****/
-   Prj_FreeMemProject (&Prj);
-
-   /***** Project file browser *****/
-   Gbl.CurrentCrs.Prjs.PrjCod = Prj.PrjCod;	// Used in file browser
-   Brw_ShowFileBrowserOrWorks ();
   }
 
 /*****************************************************************************/

swad_project.h

@@ -111,7 +111,7 @@ void Prj_SeeProjects (void);
 void Prj_ShowTableAllProjects (void);
 void Prj_PutParamWhichPrjs (void);
 
-void Prj_FileBrowserPrj (void);
+void Prj_ShowOneUniqueProject (struct Project *Prj);
 
 void Prj_PrintOneProject (void);