Marown/swad-core
Marown/swad-core
1
0
Fork 0
mirror of https://github.com/acanas/swad-core.git synced 2024-06-11 03:05:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Version 16.109.1

Browse Source
This commit is contained in:
Antonio Cañas Vargas 2016-12-27 20:17:30 +01:00
parent 59f5af9e97
commit f5d2e2cac6
2 changed files with 65 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
swad_changelog.h
View File

@ -189,13 +189,14 @@
/****************************** Public constants *****************************/ /****************************** Public constants *****************************/
/*****************************************************************************/ /*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 16.109 (2016-12-27)" #define Log_PLATFORM_VERSION "SWAD 16.109.1 (2016-12-27)"
#define CSS_FILE "swad16.108.css" #define CSS_FILE "swad16.108.css"
#define JS_FILE "swad16.101.js" #define JS_FILE "swad16.101.js"
// Number of lines (includes comments but not blank lines) has been got with the following command: // 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 // nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*?.h sql/swad*.sql | tail -1
/* /*
Version 16.109.1: Dec 27, 2016 Code refactoring in file browsers. (211460 lines)
Version 16.109: Dec 27, 2016 Code refactoring in file browsers. (211458 lines) Version 16.109: Dec 27, 2016 Code refactoring in file browsers. (211458 lines)
Version 16.108: Dec 27, 2016 Changes in layout. Version 16.108: Dec 27, 2016 Changes in layout.
Changes in behaviour of labels in forms. (211608 lines) Changes in behaviour of labels in forms. (211608 lines)

118
swad_file_browser.c
View File

@ -1479,7 +1479,9 @@ static void Brw_PutHiddenParamFullTreeIfSelected (void);
static bool Brw_GetFullTreeFromForm (void); static bool Brw_GetFullTreeFromForm (void);
static bool Brw_GetIfGroupFileBrowser (void); static bool Brw_GetIfGroupFileBrowser (void);
static bool Brw_GetIfUsrAssigWorksFileBrowser (void);
static bool Brw_GetIfCrsAssigWorksFileBrowser (void); static bool Brw_GetIfCrsAssigWorksFileBrowser (void);
static bool Brw_GetIfBriefcaseFileBrowser (void);
static void Brw_GetAndUpdateDateLastAccFileBrowser (void); static void Brw_GetAndUpdateDateLastAccFileBrowser (void);
static long Brw_GetGrpLastAccZone (const char *FieldNameDB); static long Brw_GetGrpLastAccZone (const char *FieldNameDB);
@ -2176,19 +2178,14 @@ void Brw_GetParAndInitFileBrowser (void)
Brw_SetFullPathInTree (Gbl.FileBrowser.Priv.PathInTreeUntilFilFolLnk, Brw_SetFullPathInTree (Gbl.FileBrowser.Priv.PathInTreeUntilFilFolLnk,
Gbl.FileBrowser.FilFolLnkName); Gbl.FileBrowser.FilFolLnkName);
switch (Gbl.FileBrowser.Type) if (Brw_GetIfCrsAssigWorksFileBrowser ())
{ {
case Brw_ADMI_ASSIG_CRS: /* Get lists of the selected users */
case Brw_ADMI_WORKS_CRS: Usr_GetListsSelectedUsrsCods ();
/* Get lists of the selected users */ /* Get user whose folder will be used to make any operation */
Usr_GetListsSelectedUsrsCods (); Usr_GetParamOtherUsrCodEncryptedAndGetListIDs ();
/* Get user whose folder will be used to make any operation */ /* Get whether we must create the zip file or not */
Usr_GetParamOtherUsrCodEncryptedAndGetListIDs (); Gbl.FileBrowser.ZIP.CreateZIP = ZIP_GetCreateZIPFromForm ();
/* Get whether we must create the zip file or not */
Gbl.FileBrowser.ZIP.CreateZIP = ZIP_GetCreateZIPFromForm ();
break;
default:
break;
} }
switch (Gbl.Action.Act) switch (Gbl.Action.Act)
@ -3421,20 +3418,12 @@ void Brw_ShowAgainFileBrowserOrWorks (void)
extern const char *Txt_Files_of_marks_must_contain_a_table_in_HTML_format_; extern const char *Txt_Files_of_marks_must_contain_a_table_in_HTML_format_;
extern const char *Txt_Disclaimer_the_files_hosted_here_; extern const char *Txt_Disclaimer_the_files_hosted_here_;
switch (Gbl.FileBrowser.Type) if (Brw_GetIfUsrAssigWorksFileBrowser ())
{ Brw_ShowFileBrowsersAsgWrkUsr ();
case Brw_ADMI_ASSIG_USR: else if (Brw_GetIfCrsAssigWorksFileBrowser ())
case Brw_ADMI_WORKS_USR: Brw_ShowFileBrowsersAsgWrkCrs ();
Brw_ShowFileBrowsersAsgWrkUsr (); else
break; Brw_ShowFileBrowserNormal ();
case Brw_ADMI_ASSIG_CRS:
case Brw_ADMI_WORKS_CRS:
Brw_ShowFileBrowsersAsgWrkCrs ();
break;
default:
Brw_ShowFileBrowserNormal ();
break;
}
/***** Help *****/ /***** Help *****/
switch (Gbl.FileBrowser.Type) switch (Gbl.FileBrowser.Type)
@ -3732,21 +3721,17 @@ static void Brw_WriteTopBeforeShowingFileBrowser (void)
/* Put checkbox to show the full tree */ /* Put checkbox to show the full tree */
Brw_PutCheckboxFullTree (); Brw_PutCheckboxFullTree ();
switch (Gbl.FileBrowser.Type) if (Brw_GetIfCrsAssigWorksFileBrowser ())
{ {
case Brw_ADMI_ASSIG_CRS: /* Put link to remove old files */
case Brw_ADMI_WORKS_CRS: if (Gbl.Action.Act != ActReqRemOldBrf)
/* Put link to create a zip file with all the works of the selected users */ Brw_PutLinkToAskRemOldFiles ();
if (!Gbl.FileBrowser.ZIP.CreateZIP) }
ZIP_PutLinkToCreateZIPAsgWrk (); else if (Brw_GetIfCrsAssigWorksFileBrowser ())
break; {
case Brw_ADMI_BRIEF_USR: /* Put link to create a zip file with all the works of the selected users */
/* Put link to remove old files */ if (!Gbl.FileBrowser.ZIP.CreateZIP)
if (Gbl.Action.Act != ActReqRemOldBrf) ZIP_PutLinkToCreateZIPAsgWrk ();
Brw_PutLinkToAskRemOldFiles ();
break;
default:
break;
} }
fprintf (Gbl.F.Out,"</div>"); fprintf (Gbl.F.Out,"</div>");
@ -4727,8 +4712,33 @@ static bool Brw_GetIfCrsAssigWorksFileBrowser (void)
{ {
switch (Gbl.FileBrowser.Type) switch (Gbl.FileBrowser.Type)
{ {
case Brw_ADMI_ASSIG_CRS: case Brw_ADMI_ASSIG_CRS: // Course assignments
case Brw_ADMI_WORKS_CRS: case Brw_ADMI_WORKS_CRS: // Course works
return true;
default:
return false;
}
}
/*****************************************************************************/
/****** Get if the current file browser is course assignments or works *******/
/*****************************************************************************/
static bool Brw_GetIfBriefcaseFileBrowser (void)
{
return (Gbl.FileBrowser.Type == Brw_ADMI_BRIEF_USR);
}
/*****************************************************************************/
/****** Get if the current file browser is course assignments or works *******/
/*****************************************************************************/
static bool Brw_GetIfUsrAssigWorksFileBrowser (void)
{
switch (Gbl.FileBrowser.Type)
{
case Brw_ADMI_ASSIG_USR: // My assignments
case Brw_ADMI_WORKS_USR: // My works
return true; return true;
default: default:
return false; return false;
@ -10689,18 +10699,16 @@ long Brw_GetCodForFiles (void)
static long Brw_GetZoneUsrCodForFiles (void) static long Brw_GetZoneUsrCodForFiles (void)
{ {
switch (Gbl.FileBrowser.Type) if (Brw_GetIfBriefcaseFileBrowser ()) // Briefcase
{ return Gbl.Usrs.Me.UsrDat.UsrCod;
case Brw_ADMI_WORKS_USR: // My works
case Brw_ADMI_ASSIG_USR: // My assignments if (Brw_GetIfUsrAssigWorksFileBrowser ()) // My assignments or works
case Brw_ADMI_BRIEF_USR: // My briefcase return Gbl.Usrs.Me.UsrDat.UsrCod;
return Gbl.Usrs.Me.UsrDat.UsrCod;
case Brw_ADMI_WORKS_CRS: // Course works if (Brw_GetIfCrsAssigWorksFileBrowser ()) // Course assignments or works
case Brw_ADMI_ASSIG_CRS: // Course assignments return Gbl.Usrs.Other.UsrDat.UsrCod;
return Gbl.Usrs.Other.UsrDat.UsrCod;
default: return -1L;
return -1L;
}
} }
/*****************************************************************************/ /*****************************************************************************/
@ -11736,7 +11744,7 @@ void Brw_RemoveOldFilesBriefcase (void)
/***** Get parameters related to file browser *****/ /***** Get parameters related to file browser *****/
Brw_GetParAndInitFileBrowser (); Brw_GetParAndInitFileBrowser ();
if (Gbl.FileBrowser.Type == Brw_ADMI_BRIEF_USR) if (Brw_GetIfCrsAssigWorksFileBrowser ())
{ {
/***** Get parameter with number of months without access *****/ /***** Get parameter with number of months without access *****/
Par_GetParToText ("Months",UnsignedStr,10); Par_GetParToText ("Months",UnsignedStr,10);