From c8d62fe570d3f42bcebfeea568e6805ed1929c9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Thu, 21 Sep 2017 00:40:09 +0200 Subject: [PATCH] Version 17.4.3 --- swad_action.c | 4 ++-- swad_changelog.h | 3 ++- swad_project.c | 30 ++++++++++++++++++++++++++---- swad_project.h | 5 ++++- 4 files changed, 34 insertions(+), 8 deletions(-) diff --git a/swad_action.c b/swad_action.c index 24d2188c5..6e3b953b9 100644 --- a/swad_action.c +++ b/swad_action.c @@ -1950,8 +1950,8 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] = /* ActHidAsg */{ 964,-1,TabUnk,ActSeeAsg ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Asg_HideAssignment ,NULL}, /* ActShoAsg */{ 965,-1,TabUnk,ActSeeAsg ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Asg_ShowAssignment ,NULL}, - /* ActFrmNewPrj */{1675,-1,TabUnk,ActSeePrj ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Prj_RequestCreatOrEditPrj ,NULL}, - /* ActEdiOnePrj */{1676,-1,TabUnk,ActSeePrj ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Prj_RequestCreatOrEditPrj ,NULL}, + /* ActFrmNewPrj */{1675,-1,TabUnk,ActSeePrj ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Prj_RequestCreatePrj ,NULL}, + /* ActEdiOnePrj */{1676,-1,TabUnk,ActSeePrj ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Prj_RequestEditPrj ,NULL}, /* ActPrnOnePrj */{1677,-1,TabUnk,ActSeePrj ,0x3F8,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_NEW_TAB,NULL ,Prj_PrintOneProject ,NULL}, /* ActNewPrj */{1678,-1,TabUnk,ActSeePrj ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Prj_RecFormProject ,NULL}, /* ActChgPrj */{1679,-1,TabUnk,ActSeePrj ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Prj_RecFormProject ,NULL}, diff --git a/swad_changelog.h b/swad_changelog.h index 50e22f632..bc0e59516 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -252,13 +252,14 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 17.4.2 (2017-09-20)" +#define Log_PLATFORM_VERSION "SWAD 17.4.3 (2017-09-21)" #define CSS_FILE "swad17.0.css" #define JS_FILE "swad16.206.3.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.4.3: Sep 21, 2017 Changes in listing and edition of projects. (230222 lines) Version 17.4.2: Sep 20, 2017 Changes in listing and edition of projects. (230203 lines) Version 17.4.1: Sep 20, 2017 Changes adding users to a project. Not finished. (230141 lines) Version 17.4: Sep 20, 2017 Actions to add users to a project. (230137 lines) diff --git a/swad_project.c b/swad_project.c index fa588738f..652d5bd86 100644 --- a/swad_project.c +++ b/swad_project.c @@ -106,6 +106,7 @@ static void Prj_ResetProject (struct Project *Prj); static void Prj_PutParamPrjCod (long PrjCod); static bool Prj_CheckIfSimilarProjectsExists (const char *Field,const char *Value,long PrjCod); +static void Prj_RequestCreatOrEditPrj (long PrjCod); static void Prj_EditOneProjectTxtArea (const char *Id, const char *Label,char *TxtField); @@ -716,6 +717,9 @@ static void Prj_ReqAnotherUsrID (Prj_RoleInProject_t RoleInProject) /***** End box *****/ Box_EndBox (); + + /***** Put a form to create/edit project *****/ + Prj_RequestCreatOrEditPrj (Gbl.Prjs.PrjCodToEdit); } /*****************************************************************************/ @@ -1218,10 +1222,28 @@ static bool Prj_CheckIfSimilarProjectsExists (const char *Field,const char *Valu } /*****************************************************************************/ -/******************** Put a form to create a new project *********************/ +/********************* Put a form to create/edit project *********************/ /*****************************************************************************/ -void Prj_RequestCreatOrEditPrj (void) +void Prj_RequestCreatePrj (void) + { + /***** Form to create project *****/ + Prj_RequestCreatOrEditPrj (-1L); // It's a new, non existing, project + } + +void Prj_RequestEditPrj (void) + { + long PrjCod; + + /***** Get project code *****/ + if ((PrjCod = Prj_GetParamPrjCod ()) == -1L) + Lay_ShowErrorAndExit ("Code of project is missing."); + + /***** Form to edit project *****/ + Prj_RequestCreatOrEditPrj (PrjCod); + } + +static void Prj_RequestCreatOrEditPrj (long PrjCod) { extern const char *Hlp_ASSESSMENT_Projects_new_project; extern const char *Hlp_ASSESSMENT_Projects_edit_project; @@ -1253,7 +1275,7 @@ void Prj_RequestCreatOrEditPrj (void) Gbl.Prjs.CurrentPage = Pag_GetParamPagNum (Pag_PROJECTS); /***** Get the code of the project *****/ - ItsANewProject = ((Prj.PrjCod = Prj_GetParamPrjCod ()) == -1L); + ItsANewProject = ((Prj.PrjCod = PrjCod) == -1L); /***** Get from the database the data of the project *****/ if (ItsANewProject) @@ -1543,7 +1565,7 @@ void Prj_RecFormProject (void) } else // TODO: The form should be filled with partial data, now is always empty - Prj_RequestCreatOrEditPrj (); + Prj_RequestCreatOrEditPrj (Prj.PrjCod); /***** Free memory of the project *****/ Prj_FreeMemProject (&Prj); diff --git a/swad_project.h b/swad_project.h index f555d000e..36a4d9f6b 100644 --- a/swad_project.h +++ b/swad_project.h @@ -78,7 +78,10 @@ void Prj_AddTut (void); void Prj_AddRev (void); void Prj_PutHiddenParamPrjOrder (void); -void Prj_RequestCreatOrEditPrj (void); + +void Prj_RequestCreatePrj (void); +void Prj_RequestEditPrj (void); + void Prj_GetListProjects (void); void Prj_GetDataOfProjectByCod (struct Project *Prj); void Prj_FreeListProjects (void);