Marown/swad-core
Marown
/
swad-core
mirror of https://github.com/acanas/swad-core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Version 17.10.3

This commit is contained in:
Antonio Cañas Vargas 2017-09-25 00:22:54 +02:00
parent 3b7c0a4c7b
commit eb72243b58
2 changed files with 144 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
swad_changelog.h
View File

@ -252,16 +252,16 @@
/****************************** Public constants *****************************/ /****************************** Public constants *****************************/
/*****************************************************************************/ /*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 17.10.1 (2017-09-24)" #define Log_PLATFORM_VERSION "SWAD 17.10.3 (2017-09-25)"
#define CSS_FILE "swad17.0.css" #define CSS_FILE "swad17.0.css"
#define JS_FILE "swad16.206.3.js" #define JS_FILE "swad16.206.3.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 17.10.3: Sep 24, 2017 TODO: Add users to projects even if they don't belong to course. (? lines) Version 17.10.3: Sep 25, 2017 Check permission when editing projects.
Version 17.10.2: Sep 24, 2017 TODO: Check permission when editing projects. Check permission when removing a user from a project. (231359 lines)
TODO: Check permission when removing a user from a project. (? lines) Version 17.10.2: Sep 24, 2017 Add users to projects even if they don't belong to course. (231335 lines)
Version 17.10.1: Sep 24, 2017 Remove user in project when removing the user. Version 17.10.1: Sep 24, 2017 Remove user in project when removing the user.
Remove projects (and users in them) in a course when removing the course. (231345 lines) Remove projects (and users in them) in a course when removing the course. (231345 lines)
Version 17.10: Sep 24, 2017 Changes in permissions to view/edit projects. Version 17.10: Sep 24, 2017 Changes in permissions to view/edit projects.

266
swad_project.c
View File

@ -106,7 +106,6 @@ static void Prj_ReqAnotherUsrID (Prj_RoleInProject_t RoleInProject);
static void Prj_AddUsrToProject (Prj_RoleInProject_t RoleInProject); static void Prj_AddUsrToProject (Prj_RoleInProject_t RoleInProject);
static void Prj_ReqRemUsrFromPrj (Prj_RoleInProject_t RoleInProject); static void Prj_ReqRemUsrFromPrj (Prj_RoleInProject_t RoleInProject);
static void Prj_RemUsrFromPrj (Prj_RoleInProject_t RoleInProject); static void Prj_RemUsrFromPrj (Prj_RoleInProject_t RoleInProject);
static bool Prj_CheckIfICanRemUsrFromPrj (void);
static void Prj_GetParamPrjOrder (void); static void Prj_GetParamPrjOrder (void);
@ -1180,7 +1179,6 @@ static void Prj_AddUsrToProject (Prj_RoleInProject_t RoleInProject)
{ {
extern const char *Txt_THE_USER_X_has_been_enroled_as_a_Y_in_the_project; extern const char *Txt_THE_USER_X_has_been_enroled_as_a_Y_in_the_project;
extern const char *Txt_PROJECT_ROLES_SINGUL_abc[Prj_NUM_ROLES_IN_PROJECT]; extern const char *Txt_PROJECT_ROLES_SINGUL_abc[Prj_NUM_ROLES_IN_PROJECT];
extern const char *Txt_THE_USER_X_already_exists_in_Y_but_is_not_yet_enroled_in_the_course_Z;
extern const char *Txt_User_not_found_or_you_do_not_have_permission_; extern const char *Txt_User_not_found_or_you_do_not_have_permission_;
long PrjCod; long PrjCod;
struct ListUsrCods ListUsrCods; struct ListUsrCods ListUsrCods;
@ -1205,28 +1203,19 @@ static void Prj_AddUsrToProject (Prj_RoleInProject_t RoleInProject)
Gbl.Usrs.Other.UsrDat.UsrCod = ListUsrCods.Lst[NumUsr]; Gbl.Usrs.Other.UsrDat.UsrCod = ListUsrCods.Lst[NumUsr];
Usr_GetAllUsrDataFromUsrCod (&Gbl.Usrs.Other.UsrDat); Usr_GetAllUsrDataFromUsrCod (&Gbl.Usrs.Other.UsrDat);
/* Check if this user belongs to the current course */ /* Add user to project */
if (Usr_CheckIfUsrBelongsToCurrentCrs (&Gbl.Usrs.Other.UsrDat)) sprintf (Query,"REPLACE INTO prj_usr"
{ " (PrjCod,RoleInProject,UsrCod)"
/***** Add user to project *****/ " VALUES"
sprintf (Query,"REPLACE INTO prj_usr" " (%ld,%u,%ld)",
" (PrjCod,RoleInProject,UsrCod)" PrjCod,(unsigned) RoleInProject,Gbl.Usrs.Other.UsrDat.UsrCod);
" VALUES" DB_QueryREPLACE (Query,"can not add user to project");
" (%ld,%u,%ld)",
PrjCod,(unsigned) RoleInProject,Gbl.Usrs.Other.UsrDat.UsrCod);
DB_QueryREPLACE (Query,"can not add user to project");
sprintf (Gbl.Alert.Txt,Txt_THE_USER_X_has_been_enroled_as_a_Y_in_the_project, /* Show success alert */
Gbl.Usrs.Other.UsrDat.FullName, sprintf (Gbl.Alert.Txt,Txt_THE_USER_X_has_been_enroled_as_a_Y_in_the_project,
Txt_PROJECT_ROLES_SINGUL_abc[RoleInProject]); Gbl.Usrs.Other.UsrDat.FullName,
Ale_ShowAlert (Ale_SUCCESS,Gbl.Alert.Txt); Txt_PROJECT_ROLES_SINGUL_abc[RoleInProject]);
} Ale_ShowAlert (Ale_SUCCESS,Gbl.Alert.Txt);
else // User does not belong to the current course
{
sprintf (Gbl.Alert.Txt,Txt_THE_USER_X_already_exists_in_Y_but_is_not_yet_enroled_in_the_course_Z,
Gbl.Usrs.Other.UsrDat.FullName,Cfg_PLATFORM_SHORT_NAME,Gbl.CurrentCrs.Crs.FullName);
Ale_ShowAlert (Ale_WARNING,Gbl.Alert.Txt);
}
} }
/***** Free list of users' codes *****/ /***** Free list of users' codes *****/
@ -1291,7 +1280,7 @@ static void Prj_ReqRemUsrFromPrj (Prj_RoleInProject_t RoleInProject)
/***** Get user to be removed *****/ /***** Get user to be removed *****/
if (Usr_GetParamOtherUsrCodEncryptedAndGetUsrData ()) if (Usr_GetParamOtherUsrCodEncryptedAndGetUsrData ())
{ {
if (Prj_CheckIfICanRemUsrFromPrj ()) if (Prj_CheckIfICanEditProject (Prj.PrjCod))
{ {
ItsMe = (Gbl.Usrs.Me.UsrDat.UsrCod == Gbl.Usrs.Other.UsrDat.UsrCod); ItsMe = (Gbl.Usrs.Me.UsrDat.UsrCod == Gbl.Usrs.Other.UsrDat.UsrCod);
@ -1373,7 +1362,7 @@ static void Prj_RemUsrFromPrj (Prj_RoleInProject_t RoleInProject)
/***** Get user to be removed *****/ /***** Get user to be removed *****/
if (Usr_GetParamOtherUsrCodEncryptedAndGetUsrData ()) if (Usr_GetParamOtherUsrCodEncryptedAndGetUsrData ())
{ {
if (Prj_CheckIfICanRemUsrFromPrj ()) if (Prj_CheckIfICanEditProject (Prj.PrjCod))
{ {
/***** Remove user from the table of project-users *****/ /***** Remove user from the table of project-users *****/
sprintf (Query,"DELETE FROM prj_usr" sprintf (Query,"DELETE FROM prj_usr"
@ -1403,15 +1392,6 @@ static void Prj_RemUsrFromPrj (Prj_RoleInProject_t RoleInProject)
Prj_RequestCreatOrEditPrj (Prj.PrjCod); Prj_RequestCreatOrEditPrj (Prj.PrjCod);
} }
/*****************************************************************************/
/*********** Check if I can remove another user in current course ************/
/*****************************************************************************/
static bool Prj_CheckIfICanRemUsrFromPrj (void)
{
return true; // TODO: Rewrite this function
}
/*****************************************************************************/ /*****************************************************************************/
/********* Get parameter with the type or order in list of projects **********/ /********* Get parameter with the type or order in list of projects **********/
/*****************************************************************************/ /*****************************************************************************/
@ -1835,13 +1815,18 @@ void Prj_ReqRemProject (void)
/***** Get data of the project from database *****/ /***** Get data of the project from database *****/
Prj_GetDataOfProjectByCod (&Prj); Prj_GetDataOfProjectByCod (&Prj);
/***** Show question and button to remove the project *****/ if (Prj_CheckIfICanEditProject (Prj.PrjCod))
Gbl.Prjs.PrjCodToEdit = Prj.PrjCod; {
sprintf (Gbl.Alert.Txt,Txt_Do_you_really_want_to_remove_the_project_X, /***** Show question and button to remove the project *****/
Prj.Title); Gbl.Prjs.PrjCodToEdit = Prj.PrjCod;
Ale_ShowAlertAndButton (Ale_QUESTION,Gbl.Alert.Txt, sprintf (Gbl.Alert.Txt,Txt_Do_you_really_want_to_remove_the_project_X,
ActRemPrj,NULL,NULL,Prj_PutParams, Prj.Title);
Btn_REMOVE_BUTTON,Txt_Remove_project); Ale_ShowAlertAndButton (Ale_QUESTION,Gbl.Alert.Txt,
ActRemPrj,NULL,NULL,Prj_PutParams,
Btn_REMOVE_BUTTON,Txt_Remove_project);
}
else
Ale_ShowAlert (Ale_ERROR,"You don't have permission to edit this project.");
/***** Free memory of the project *****/ /***** Free memory of the project *****/
Prj_FreeMemProject (&Prj); Prj_FreeMemProject (&Prj);
@ -1872,23 +1857,28 @@ void Prj_RemoveProject (void)
/***** Get data of the project from database *****/ /***** Get data of the project from database *****/
Prj_GetDataOfProjectByCod (&Prj); // Inside this function, the course is checked to be the current one Prj_GetDataOfProjectByCod (&Prj); // Inside this function, the course is checked to be the current one
/***** Remove users in project *****/ if (Prj_CheckIfICanEditProject (Prj.PrjCod))
sprintf (Query,"DELETE FROM prj_usr USING projects,prj_usr" {
" WHERE projects.PrjCod=%ld AND projects.CrsCod=%ld" /***** Remove users in project *****/
" AND projects.PrjCod=prj_usr.PrjCod", sprintf (Query,"DELETE FROM prj_usr USING projects,prj_usr"
Prj.PrjCod,Gbl.CurrentCrs.Crs.CrsCod); " WHERE projects.PrjCod=%ld AND projects.CrsCod=%ld"
DB_QueryDELETE (Query,"can not remove project"); " AND projects.PrjCod=prj_usr.PrjCod",
Prj.PrjCod,Gbl.CurrentCrs.Crs.CrsCod);
DB_QueryDELETE (Query,"can not remove project");
/***** Remove project *****/ /***** Remove project *****/
sprintf (Query,"DELETE FROM projects" sprintf (Query,"DELETE FROM projects"
" WHERE PrjCod=%ld AND CrsCod=%ld", " WHERE PrjCod=%ld AND CrsCod=%ld",
Prj.PrjCod,Gbl.CurrentCrs.Crs.CrsCod); Prj.PrjCod,Gbl.CurrentCrs.Crs.CrsCod);
DB_QueryDELETE (Query,"can not remove project"); DB_QueryDELETE (Query,"can not remove project");
/***** Write message to show the change made *****/ /***** Write message to show the change made *****/
sprintf (Gbl.Alert.Txt,Txt_Project_X_removed, sprintf (Gbl.Alert.Txt,Txt_Project_X_removed,
Prj.Title); Prj.Title);
Ale_ShowAlert (Ale_SUCCESS,Gbl.Alert.Txt); Ale_ShowAlert (Ale_SUCCESS,Gbl.Alert.Txt);
}
else
Ale_ShowAlert (Ale_ERROR,"You don't have permission to edit this project.");
/***** Free memory of the project *****/ /***** Free memory of the project *****/
Prj_FreeMemProject (&Prj); Prj_FreeMemProject (&Prj);
@ -1917,16 +1907,21 @@ void Prj_HideProject (void)
/***** Get data of the project from database *****/ /***** Get data of the project from database *****/
Prj_GetDataOfProjectByCod (&Prj); Prj_GetDataOfProjectByCod (&Prj);
/***** Hide project *****/ if (Prj_CheckIfICanEditProject (Prj.PrjCod))
sprintf (Query,"UPDATE projects SET Hidden='Y'" {
" WHERE PrjCod=%ld AND CrsCod=%ld", /***** Hide project *****/
Prj.PrjCod,Gbl.CurrentCrs.Crs.CrsCod); sprintf (Query,"UPDATE projects SET Hidden='Y'"
DB_QueryUPDATE (Query,"can not hide project"); " WHERE PrjCod=%ld AND CrsCod=%ld",
Prj.PrjCod,Gbl.CurrentCrs.Crs.CrsCod);
DB_QueryUPDATE (Query,"can not hide project");
/***** Write message to show the change made *****/ /***** Write message to show the change made *****/
sprintf (Gbl.Alert.Txt,Txt_Project_X_is_now_hidden, sprintf (Gbl.Alert.Txt,Txt_Project_X_is_now_hidden,
Prj.Title); Prj.Title);
Ale_ShowAlert (Ale_SUCCESS,Gbl.Alert.Txt); Ale_ShowAlert (Ale_SUCCESS,Gbl.Alert.Txt);
}
else
Ale_ShowAlert (Ale_ERROR,"You don't have permission to edit this project.");
/***** Free memory of the project *****/ /***** Free memory of the project *****/
Prj_FreeMemProject (&Prj); Prj_FreeMemProject (&Prj);
@ -1955,16 +1950,21 @@ void Prj_ShowProject (void)
/***** Get data of the project from database *****/ /***** Get data of the project from database *****/
Prj_GetDataOfProjectByCod (&Prj); Prj_GetDataOfProjectByCod (&Prj);
/***** Hide project *****/ if (Prj_CheckIfICanEditProject (Prj.PrjCod))
sprintf (Query,"UPDATE projects SET Hidden='N'" {
" WHERE PrjCod=%ld AND CrsCod=%ld", /***** Show project *****/
Prj.PrjCod,Gbl.CurrentCrs.Crs.CrsCod); sprintf (Query,"UPDATE projects SET Hidden='N'"
DB_QueryUPDATE (Query,"can not show project"); " WHERE PrjCod=%ld AND CrsCod=%ld",
Prj.PrjCod,Gbl.CurrentCrs.Crs.CrsCod);
DB_QueryUPDATE (Query,"can not show project");
/***** Write message to show the change made *****/ /***** Write message to show the change made *****/
sprintf (Gbl.Alert.Txt,Txt_Project_X_is_now_visible, sprintf (Gbl.Alert.Txt,Txt_Project_X_is_now_visible,
Prj.Title); Prj.Title);
Ale_ShowAlert (Ale_SUCCESS,Gbl.Alert.Txt); Ale_ShowAlert (Ale_SUCCESS,Gbl.Alert.Txt);
}
else
Ale_ShowAlert (Ale_ERROR,"You don't have permission to edit this project.");
/***** Free memory of the project *****/ /***** Free memory of the project *****/
Prj_FreeMemProject (&Prj); Prj_FreeMemProject (&Prj);
@ -2252,6 +2252,7 @@ void Prj_RecFormProject (void)
extern const char *Txt_The_project_has_been_modified; extern const char *Txt_The_project_has_been_modified;
struct Project Prj; // Project data received from form struct Project Prj; // Project data received from form
bool ItsANewProject; bool ItsANewProject;
bool ICanEditProject;
bool NewProjectIsCorrect = true; bool NewProjectIsCorrect = true;
/***** Allocate memory for the project *****/ /***** Allocate memory for the project *****/
@ -2263,73 +2264,86 @@ void Prj_RecFormProject (void)
ItsANewProject = (Prj.PrjCod < 0); ItsANewProject = (Prj.PrjCod < 0);
if (ItsANewProject) if (ItsANewProject)
{
/* Reset project data */ /* Reset project data */
Prj_ResetProject (&Prj); Prj_ResetProject (&Prj);
ICanEditProject = true;
}
else else
{
/* Get data of the project from database */ /* Get data of the project from database */
Prj_GetDataOfProjectByCod (&Prj); Prj_GetDataOfProjectByCod (&Prj);
/* Get start/end date-times */ ICanEditProject = Prj_CheckIfICanEditProject (Prj.PrjCod);
Prj.TimeUTC[Dat_START_TIME] = Dat_GetTimeUTCFromForm ("StartTimeUTC");
Prj.TimeUTC[Dat_END_TIME ] = Dat_GetTimeUTCFromForm ("EndTimeUTC" );
/* Get project title */
Par_GetParToText ("Title",Prj.Title,Prj_MAX_BYTES_PROJECT_TITLE);
/* Get department */
Prj.DptCod = Par_GetParToLong ("DptCod");
/* Get project description, required knowledge and required materials */
Par_GetParToHTML ("Description",Prj.Description,Cns_MAX_BYTES_TEXT); // Store in HTML format (not rigorous)
Par_GetParToHTML ("Knowledge" ,Prj.Knowledge ,Cns_MAX_BYTES_TEXT); // Store in HTML format (not rigorous)
Par_GetParToHTML ("Materials" ,Prj.Materials ,Cns_MAX_BYTES_TEXT); // Store in HTML format (not rigorous)
/* Get degree WWW */
Par_GetParToText ("URL",Prj.URL,Cns_MAX_BYTES_WWW);
/* Get whether the project is preassigned */
Prj.Preassigned = (Par_GetParToBool ("Preassigned")) ? Prj_PREASSIGNED :
Prj_NOT_PREASSIGNED;
/***** Adjust dates *****/
if (Prj.TimeUTC[Dat_START_TIME] == 0)
Prj.TimeUTC[Dat_START_TIME] = Gbl.StartExecutionTimeUTC;
if (Prj.TimeUTC[Dat_END_TIME] == 0)
Prj.TimeUTC[Dat_END_TIME] = Prj.TimeUTC[Dat_START_TIME] +
Prj_INTERVAL_DEFAULT;
/***** Check if title is correct *****/
if (!Prj.Title[0]) // If there is not a project title
{
NewProjectIsCorrect = false;
Ale_ShowAlert (Ale_WARNING,Txt_You_must_specify_the_title_of_the_project);
} }
/***** Create a new project or update an existing one *****/ if (ICanEditProject)
if (NewProjectIsCorrect)
{ {
if (ItsANewProject) /* Get start/end date-times */
{ Prj.TimeUTC[Dat_START_TIME] = Dat_GetTimeUTCFromForm ("StartTimeUTC");
Prj_CreateProject (&Prj); // Add new project to database Prj.TimeUTC[Dat_END_TIME ] = Dat_GetTimeUTCFromForm ("EndTimeUTC" );
/***** Write success message *****/ /* Get project title */
sprintf (Gbl.Alert.Txt,Txt_Created_new_project_X,Prj.Title); Par_GetParToText ("Title",Prj.Title,Prj_MAX_BYTES_PROJECT_TITLE);
Ale_ShowAlert (Ale_SUCCESS,Gbl.Alert.Txt);
}
else if (NewProjectIsCorrect)
{
Prj_UpdateProject (&Prj);
/***** Write success message *****/ /* Get department */
Ale_ShowAlert (Ale_SUCCESS,Txt_The_project_has_been_modified); Prj.DptCod = Par_GetParToLong ("DptCod");
/* Get project description, required knowledge and required materials */
Par_GetParToHTML ("Description",Prj.Description,Cns_MAX_BYTES_TEXT); // Store in HTML format (not rigorous)
Par_GetParToHTML ("Knowledge" ,Prj.Knowledge ,Cns_MAX_BYTES_TEXT); // Store in HTML format (not rigorous)
Par_GetParToHTML ("Materials" ,Prj.Materials ,Cns_MAX_BYTES_TEXT); // Store in HTML format (not rigorous)
/* Get degree WWW */
Par_GetParToText ("URL",Prj.URL,Cns_MAX_BYTES_WWW);
/* Get whether the project is preassigned */
Prj.Preassigned = (Par_GetParToBool ("Preassigned")) ? Prj_PREASSIGNED :
Prj_NOT_PREASSIGNED;
/***** Adjust dates *****/
if (Prj.TimeUTC[Dat_START_TIME] == 0)
Prj.TimeUTC[Dat_START_TIME] = Gbl.StartExecutionTimeUTC;
if (Prj.TimeUTC[Dat_END_TIME] == 0)
Prj.TimeUTC[Dat_END_TIME] = Prj.TimeUTC[Dat_START_TIME] +
Prj_INTERVAL_DEFAULT;
/***** Check if title is correct *****/
if (!Prj.Title[0]) // If there is not a project title
{
NewProjectIsCorrect = false;
Ale_ShowAlert (Ale_WARNING,Txt_You_must_specify_the_title_of_the_project);
} }
/***** Show projects again *****/ /***** Create a new project or update an existing one *****/
Prj_SeeProjects (); if (NewProjectIsCorrect)
{
if (ItsANewProject)
{
Prj_CreateProject (&Prj); // Add new project to database
/***** Write success message *****/
sprintf (Gbl.Alert.Txt,Txt_Created_new_project_X,Prj.Title);
Ale_ShowAlert (Ale_SUCCESS,Gbl.Alert.Txt);
}
else if (NewProjectIsCorrect)
{
Prj_UpdateProject (&Prj);
/***** Write success message *****/
Ale_ShowAlert (Ale_SUCCESS,Txt_The_project_has_been_modified);
}
/***** Show projects again *****/
Prj_SeeProjects ();
}
else
// TODO: The form should be filled with partial data, now is always empty
Prj_RequestCreatOrEditPrj (Prj.PrjCod);
} }
else else
// TODO: The form should be filled with partial data, now is always empty Ale_ShowAlert (Ale_ERROR,"You don't have permission to edit this project.");
Prj_RequestCreatOrEditPrj (Prj.PrjCod);
/***** Free memory of the project *****/ /***** Free memory of the project *****/
Prj_FreeMemProject (&Prj); Prj_FreeMemProject (&Prj);