mirror of
https://github.com/acanas/swad-core.git
synced 2024-06-10 10:45:23 +02:00
Version19.97.1
This commit is contained in:
parent
11705ad5a8
commit
543398585d
|
@ -417,7 +417,6 @@ static void Asg_ShowOneAssignment (long AsgCod,bool PrintView)
|
||||||
HTM_TD_Begin ("class=\"DAT LT COLOR%u\"",Gbl.RowEvenOdd);
|
HTM_TD_Begin ("class=\"DAT LT COLOR%u\"",Gbl.RowEvenOdd);
|
||||||
if (Asg.SendWork == Asg_SEND_WORK)
|
if (Asg.SendWork == Asg_SEND_WORK)
|
||||||
Asg_WriteAssignmentFolder (&Asg,PrintView);
|
Asg_WriteAssignmentFolder (&Asg,PrintView);
|
||||||
|
|
||||||
HTM_TD_End ();
|
HTM_TD_End ();
|
||||||
|
|
||||||
HTM_TR_End ();
|
HTM_TR_End ();
|
||||||
|
@ -480,9 +479,9 @@ static void Asg_WriteAssignmentFolder (struct Assignment *Asg,bool PrintView)
|
||||||
{
|
{
|
||||||
extern const char *Txt_Upload_file_or_create_folder;
|
extern const char *Txt_Upload_file_or_create_folder;
|
||||||
extern const char *Txt_Folder;
|
extern const char *Txt_Folder;
|
||||||
bool ICanSendFiles = !Asg->Hidden && // It's visible (not hidden)
|
bool ICanSendFiles = !Asg->Hidden && // It's visible (not hidden)
|
||||||
Asg->Open && // It's open (inside dates)
|
Asg->Open && // It's open (inside dates)
|
||||||
Asg->IBelongToCrsOrGrps; // I belong to course or groups
|
Asg->IBelongToCrsOrGrps; // I belong to course or groups
|
||||||
|
|
||||||
/***** Folder icon *****/
|
/***** Folder icon *****/
|
||||||
if (!PrintView && // Not print view
|
if (!PrintView && // Not print view
|
||||||
|
@ -490,7 +489,7 @@ static void Asg_WriteAssignmentFolder (struct Assignment *Asg,bool PrintView)
|
||||||
{
|
{
|
||||||
/* Form to create a new file or folder */
|
/* Form to create a new file or folder */
|
||||||
Gbl.FileBrowser.FullTree = true; // By default, show all files
|
Gbl.FileBrowser.FullTree = true; // By default, show all files
|
||||||
switch (Gbl.Usrs.Me.UsrDat.Roles.InCurrentCrs.Role)
|
switch (Gbl.Usrs.Me.Role.Logged)
|
||||||
{
|
{
|
||||||
case Rol_STD:
|
case Rol_STD:
|
||||||
Gbl.FileBrowser.Type = Brw_ADMI_ASG_USR; // User assignments
|
Gbl.FileBrowser.Type = Brw_ADMI_ASG_USR; // User assignments
|
||||||
|
@ -498,11 +497,11 @@ static void Asg_WriteAssignmentFolder (struct Assignment *Asg,bool PrintView)
|
||||||
break;
|
break;
|
||||||
case Rol_NET:
|
case Rol_NET:
|
||||||
case Rol_TCH:
|
case Rol_TCH:
|
||||||
|
case Rol_SYS_ADM:
|
||||||
Gbl.FileBrowser.Type = Brw_ADMI_ASG_CRS; // Course assignments
|
Gbl.FileBrowser.Type = Brw_ADMI_ASG_CRS; // Course assignments
|
||||||
Str_Copy (Gbl.Usrs.Other.UsrDat.EncryptedUsrCod,Gbl.Usrs.Me.UsrDat.EncryptedUsrCod,
|
Str_Copy (Gbl.Usrs.Other.UsrDat.EncryptedUsrCod,Gbl.Usrs.Me.UsrDat.EncryptedUsrCod,
|
||||||
Cry_BYTES_ENCRYPTED_STR_SHA256_BASE64);
|
Cry_BYTES_ENCRYPTED_STR_SHA256_BASE64);
|
||||||
Usr_CreateListSelectedUsrsCodsAndFillWithOtherUsr (&Gbl.Usrs.Selected)
|
Usr_CreateListSelectedUsrsCodsAndFillWithOtherUsr (&Gbl.Usrs.Selected);
|
||||||
;
|
|
||||||
Frm_StartForm (ActFrmCreAsgCrs);
|
Frm_StartForm (ActFrmCreAsgCrs);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
|
@ -518,12 +517,13 @@ static void Asg_WriteAssignmentFolder (struct Assignment *Asg,bool PrintView)
|
||||||
Ico_PutIconLink ("folder-open-yellow-plus.png",
|
Ico_PutIconLink ("folder-open-yellow-plus.png",
|
||||||
Txt_Upload_file_or_create_folder);
|
Txt_Upload_file_or_create_folder);
|
||||||
Frm_EndForm ();
|
Frm_EndForm ();
|
||||||
switch (Gbl.Usrs.Me.UsrDat.Roles.InCurrentCrs.Role)
|
switch (Gbl.Usrs.Me.Role.Logged)
|
||||||
{
|
{
|
||||||
case Rol_STD:
|
case Rol_STD:
|
||||||
break;
|
break;
|
||||||
case Rol_NET:
|
case Rol_NET:
|
||||||
case Rol_TCH:
|
case Rol_TCH:
|
||||||
|
case Rol_SYS_ADM:
|
||||||
Usr_FreeListsSelectedEncryptedUsrsCods (&Gbl.Usrs.Selected);
|
Usr_FreeListsSelectedEncryptedUsrsCods (&Gbl.Usrs.Selected);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
|
@ -1718,11 +1718,7 @@ static bool Asg_CheckIfIBelongToCrsOrGrpsThisAssignment (long AsgCod)
|
||||||
" AND asg_grp.GrpCod=crs_grp_usr.GrpCod)"
|
" AND asg_grp.GrpCod=crs_grp_usr.GrpCod)"
|
||||||
")",
|
")",
|
||||||
AsgCod,Gbl.Usrs.Me.UsrDat.UsrCod) != 0);
|
AsgCod,Gbl.Usrs.Me.UsrDat.UsrCod) != 0);
|
||||||
case Rol_DEG_ADM:
|
|
||||||
case Rol_CTR_ADM:
|
|
||||||
case Rol_INS_ADM:
|
|
||||||
case Rol_SYS_ADM:
|
case Rol_SYS_ADM:
|
||||||
// Admins can view assignments
|
|
||||||
return true;
|
return true;
|
||||||
default:
|
default:
|
||||||
return false;
|
return false;
|
||||||
|
|
|
@ -329,8 +329,7 @@ static void Ctr_Configuration (bool PrintView)
|
||||||
Ctr_ConfigTitle (PutLink);
|
Ctr_ConfigTitle (PutLink);
|
||||||
|
|
||||||
/***** Centre map *****/
|
/***** Centre map *****/
|
||||||
if (Gbl.Usrs.Me.Role.Logged == Rol_SYS_ADM)
|
Ctr_ConfigMap ();
|
||||||
Ctr_ConfigMap ();
|
|
||||||
|
|
||||||
/***** Centre photo *****/
|
/***** Centre photo *****/
|
||||||
Ctr_ConfigPhoto (PrintView,PutLink);
|
Ctr_ConfigPhoto (PrintView,PutLink);
|
||||||
|
|
|
@ -492,7 +492,7 @@ enscript -2 --landscape --color --file-align=2 --highlight --line-numbers -o - *
|
||||||
En OpenSWAD:
|
En OpenSWAD:
|
||||||
ps2pdf source.ps destination.pdf
|
ps2pdf source.ps destination.pdf
|
||||||
*/
|
*/
|
||||||
#define Log_PLATFORM_VERSION "SWAD 19.97 (2019-12-19)"
|
#define Log_PLATFORM_VERSION "SWAD 19.97.1 (2019-12-19)"
|
||||||
#define CSS_FILE "swad19.97.css"
|
#define CSS_FILE "swad19.97.css"
|
||||||
#define JS_FILE "swad19.91.1.js"
|
#define JS_FILE "swad19.91.1.js"
|
||||||
/*
|
/*
|
||||||
|
@ -500,6 +500,7 @@ ps2pdf source.ps destination.pdf
|
||||||
// TODO: Impedir la creación y edición de proyectos si no son editables.
|
// TODO: Impedir la creación y edición de proyectos si no son editables.
|
||||||
// TODO: No se puede entrar con DNI '1' suponiendo que no tenga password ¿por qué?
|
// TODO: No se puede entrar con DNI '1' suponiendo que no tenga password ¿por qué?
|
||||||
|
|
||||||
|
Version 19.97.1: Dec 19, 2019 Fix bug in assignments. (249804 lines)
|
||||||
Version 19.97: Dec 19, 2019 Forms to edit centro latitude, longitude and altitude. (249807 lines)
|
Version 19.97: Dec 19, 2019 Forms to edit centro latitude, longitude and altitude. (249807 lines)
|
||||||
3 changes necessary in database:
|
3 changes necessary in database:
|
||||||
ALTER TABLE centres ADD COLUMN Latitude DOUBLE PRECISION NOT NULL DEFAULT 0 AFTER RequesterUsrCod;
|
ALTER TABLE centres ADD COLUMN Latitude DOUBLE PRECISION NOT NULL DEFAULT 0 AFTER RequesterUsrCod;
|
||||||
|
|
Loading…
Reference in New Issue
Block a user