");
- Gbl.Prjs.PrjCodToEdit = Prj->PrjCod; // Used to pass project code as a parameter
+ Gbl.Prjs.PrjCod = Prj->PrjCod; // Used to pass project code as a parameter
sprintf (Gbl.Title,Txt_Add_USER,Txt_PROJECT_ROLES_SINGUL_abc[RoleInProject]);
- Lay_PutContextualLink (ActionReqAddUsr[RoleInProject],NULL,Prj_PutParams,
+ Lay_PutContextualLink (ActionReqAddUsr[RoleInProject],NULL,Prj_PutCurrentParams,
"plus64x64.png",
Gbl.Title,NULL,
NULL);
@@ -1336,8 +1541,8 @@ static void Prj_ShowTableAllProjectsMembersWithARole (const struct Project *Prj,
/***** Start column with list of all members with this role *****/
fprintf (Gbl.F.Out,"
",
Gbl.RowEvenOdd,
- Prj->Hidden ? "DAT_LIGHT" :
- "DAT");
+ Prj->Hidden == Prj_HIDDEN ? "DAT_LIGHT" :
+ "DAT");
if (NumUsrs)
{
@@ -1496,7 +1701,7 @@ static void Prj_ReqAnotherUsrID (Prj_RoleInProject_t RoleInProject)
};
/***** Get project code *****/
- if ((Gbl.Prjs.PrjCodToEdit = Prj_GetParamPrjCod ()) == -1L)
+ if ((Gbl.Prjs.PrjCod = Prj_GetParamPrjCod ()) == -1L)
Lay_ShowErrorAndExit ("Code of project is missing.");
/***** Start box *****/
@@ -1505,13 +1710,13 @@ static void Prj_ReqAnotherUsrID (Prj_RoleInProject_t RoleInProject)
Hlp_ASSESSMENT_Projects_add_user,Box_NOT_CLOSABLE);
/***** Write form to request another user's ID *****/
- Enr_WriteFormToReqAnotherUsrID (ActionAddUsr[RoleInProject],Prj_PutParams);
+ Enr_WriteFormToReqAnotherUsrID (ActionAddUsr[RoleInProject],Prj_PutCurrentParams);
/***** End box *****/
Box_EndBox ();
/***** Put a form to create/edit project *****/
- Prj_RequestCreatOrEditPrj (Gbl.Prjs.PrjCodToEdit);
+ Prj_RequestCreatOrEditPrj (Gbl.Prjs.PrjCod);
}
/*****************************************************************************/
@@ -1631,9 +1836,7 @@ static void Prj_ReqRemUsrFromPrj (Prj_RoleInProject_t RoleInProject)
Prj_AllocMemProject (&Prj);
/***** Get parameters *****/
- Prj_GetParamPrjOrder ();
- Prj_GetParamWhichPrjs ();
- Gbl.Prjs.CurrentPage = Pag_GetParamPagNum (Pag_PROJECTS);
+ Prj_GetParams ();
if ((Prj.PrjCod = Prj_GetParamPrjCod ()) < 0)
Lay_ShowErrorAndExit ("Code of project is missing.");
@@ -1661,8 +1864,8 @@ static void Prj_ReqRemUsrFromPrj (Prj_RoleInProject_t RoleInProject)
/* Show form to request confirmation */
Act_FormStart (ActionRemUsr[RoleInProject]);
- Gbl.Prjs.PrjCodToEdit = Prj.PrjCod;
- Prj_PutParams ();
+ Gbl.Prjs.PrjCod = Prj.PrjCod;
+ Prj_PutCurrentParams ();
Btn_PutRemoveButton (ItsMe ? Txt_Remove_me_from_this_project :
Txt_Remove_user_from_this_project);
Act_FormEnd ();
@@ -1714,9 +1917,7 @@ static void Prj_RemUsrFromPrj (Prj_RoleInProject_t RoleInProject)
Prj_AllocMemProject (&Prj);
/***** Get parameters *****/
- Prj_GetParamPrjOrder ();
- Prj_GetParamWhichPrjs ();
- Gbl.Prjs.CurrentPage = Pag_GetParamPagNum (Pag_PROJECTS);
+ Prj_GetParams ();
if ((Prj.PrjCod = Prj_GetParamPrjCod ()) < 0)
Lay_ShowErrorAndExit ("Code of project is missing.");
@@ -1786,32 +1987,37 @@ void Prj_PutHiddenParamPrjOrder (void)
/****************** Put a link (form) to edit one project ********************/
/*****************************************************************************/
-static void Prj_PutFormsToRemEditOnePrj (long PrjCod,bool Hidden,
+static void Prj_PutFormsToRemEditOnePrj (long PrjCod,Prj_HiddenVisibl_t Hidden,
bool ICanViewProjectFiles)
{
- Gbl.Prjs.PrjCodToEdit = PrjCod; // Used as parameter in contextual links
+ Gbl.Prjs.PrjCod = PrjCod; // Used as parameter in contextual links
if (Prj_CheckIfICanEditProject (PrjCod))
{
/***** Put form to remove project *****/
- Ico_PutContextualIconToRemove (ActReqRemPrj,Prj_PutParams);
+ Ico_PutContextualIconToRemove (ActReqRemPrj,Prj_PutCurrentParams);
/***** Put form to hide/show project *****/
- if (Hidden)
- Ico_PutContextualIconToUnhide (ActShoPrj,Prj_PutParams);
- else
- Ico_PutContextualIconToHide (ActHidPrj,Prj_PutParams);
+ switch (Hidden)
+ {
+ case Prj_HIDDEN:
+ Ico_PutContextualIconToUnhide (ActShoPrj,Prj_PutCurrentParams);
+ break;
+ case Prj_VISIBL:
+ Ico_PutContextualIconToHide (ActHidPrj,Prj_PutCurrentParams);
+ break;
+ }
/***** Put form to edit project *****/
- Ico_PutContextualIconToEdit (ActEdiOnePrj,Prj_PutParams);
+ Ico_PutContextualIconToEdit (ActEdiOnePrj,Prj_PutCurrentParams);
}
/***** Put form to admin project documents *****/
if (ICanViewProjectFiles)
- Ico_PutContextualIconToViewFiles (ActAdmDocPrj,Prj_PutParams);
+ Ico_PutContextualIconToViewFiles (ActAdmDocPrj,Prj_PutCurrentParams);
/***** Put form to print project *****/
- Ico_PutContextualIconToPrint (ActPrnOnePrj,Prj_PutParams);
+ Ico_PutContextualIconToPrint (ActPrnOnePrj,Prj_PutCurrentParams);
}
/*****************************************************************************/
@@ -1860,30 +2066,18 @@ static bool Prj_CheckIfICanEditProject (long PrjCod)
}
}
-/*****************************************************************************/
-/********************** Params used to edit a project ************************/
-/*****************************************************************************/
-
-static void Prj_PutParams (void)
- {
- if (Gbl.Prjs.PrjCodToEdit > 0)
- Prj_PutParamPrjCod (Gbl.Prjs.PrjCodToEdit);
- Prj_PutHiddenParamPrjOrder ();
- Prj_PutParamWhichPrjs ();
- Pag_PutHiddenParamPagNum (Pag_PROJECTS,Gbl.Prjs.CurrentPage);
- if (Gbl.Usrs.Other.UsrDat.UsrCod > 0)
- Usr_PutParamOtherUsrCodEncrypted ();
- }
-
/*****************************************************************************/
/************************** List all the projects ****************************/
/*****************************************************************************/
+#define Prj_MAX_BYTES_SUBQUERY 128
+
void Prj_GetListProjects (void)
{
- char HiddenSubQuery[256];
- char OrderBySubQuery[256];
- char Query[2048];
+ char PreNonSubQuery[Prj_MAX_BYTES_SUBQUERY];
+ char HidVisSubQuery[Prj_MAX_BYTES_SUBQUERY];
+ char OrderBySubQuery[Prj_MAX_BYTES_SUBQUERY];
+ char Query[512 * Prj_MAX_BYTES_SUBQUERY * 3];
MYSQL_RES *mysql_res;
MYSQL_ROW row;
unsigned long NumRows;
@@ -1893,125 +2087,172 @@ void Prj_GetListProjects (void)
Prj_FreeListProjects ();
/***** Get list of projects from database *****/
- /* Hidden subquery */
- switch (Gbl.Usrs.Me.Role.Logged)
- {
- case Rol_NET:
- case Rol_TCH:
- case Rol_SYS_ADM:
- HiddenSubQuery[0] = '\0';
- break;
- default:
- sprintf (HiddenSubQuery," AND projects.Hidden='N'");
- break;
- }
-
- /* Order subquery */
- switch (Gbl.Prjs.SelectedOrder)
- {
- case Prj_ORDER_START_TIME:
- sprintf (OrderBySubQuery,"projects.CreatTime DESC,"
- "projects.ModifTime DESC,"
- "projects.Title");
- break;
- case Prj_ORDER_END_TIME:
- sprintf (OrderBySubQuery,"projects.ModifTime DESC,"
- "projects.CreatTime DESC,"
- "projects.Title");
- break;
- case Prj_ORDER_TITLE:
- sprintf (OrderBySubQuery,"projects.Title,"
- "projects.CreatTime DESC,"
- "projects.ModifTime DESC");
- break;
- case Prj_ORDER_DEPARTMENT:
- sprintf (OrderBySubQuery,"departments.FullName,"
- "projects.CreatTime DESC,"
- "projects.ModifTime DESC,"
- "projects.Title");
- break;
- }
-
- /* Query */
- if (Gbl.CurrentCrs.Prjs.WhichPrjs == Prj_ONLY_MY_PROJECTS)
- switch (Gbl.Prjs.SelectedOrder)
- {
- case Prj_ORDER_START_TIME:
- case Prj_ORDER_END_TIME:
- case Prj_ORDER_TITLE:
- sprintf (Query,"SELECT projects.PrjCod"
- " FROM projects,prj_usr"
- " WHERE projects.CrsCod=%ld%s"
- " AND projects.PrjCod=prj_usr.PrjCod"
- " AND prj_usr.UsrCod=%ld"
- " ORDER BY %s",
- Gbl.CurrentCrs.Crs.CrsCod,HiddenSubQuery,
- Gbl.Usrs.Me.UsrDat.UsrCod,
- OrderBySubQuery);
- break;
- case Prj_ORDER_DEPARTMENT:
- sprintf (Query,"SELECT projects.PrjCod"
- " FROM prj_usr,projects LEFT JOIN departments"
- " ON projects.DptCod=departments.DptCod"
- " WHERE projects.CrsCod=%ld%s"
- " AND projects.PrjCod=prj_usr.PrjCod"
- " AND prj_usr.UsrCod=%ld"
- " ORDER BY %s",
- Gbl.CurrentCrs.Crs.CrsCod,HiddenSubQuery,
- Gbl.Usrs.Me.UsrDat.UsrCod,
- OrderBySubQuery);
- break;
- }
- else // Gbl.CurrentCrs.Prjs.WhichPrjs == Prj_ALL_PROJECTS
- switch (Gbl.Prjs.SelectedOrder)
- {
- case Prj_ORDER_START_TIME:
- case Prj_ORDER_END_TIME:
- case Prj_ORDER_TITLE:
- sprintf (Query,"SELECT projects.PrjCod"
- " FROM projects"
- " WHERE projects.CrsCod=%ld%s"
- " ORDER BY %s",
- Gbl.CurrentCrs.Crs.CrsCod,HiddenSubQuery,
- OrderBySubQuery);
- break;
- case Prj_ORDER_DEPARTMENT:
- sprintf (Query,"SELECT projects.PrjCod"
- " FROM projects LEFT JOIN departments"
- " ON projects.DptCod=departments.DptCod"
- " WHERE projects.CrsCod=%ld%s"
- " ORDER BY %s",
- Gbl.CurrentCrs.Crs.CrsCod,HiddenSubQuery,
- OrderBySubQuery);
- break;
- }
-
- NumRows = DB_QuerySELECT (Query,&mysql_res,"can not get projects");
-
- if (NumRows) // Projects found...
- {
- Gbl.Prjs.Num = (unsigned) NumRows;
-
- /***** Create list of projects *****/
- if ((Gbl.Prjs.LstPrjCods = (long *) calloc (NumRows,sizeof (long))) == NULL)
- Lay_ShowErrorAndExit ("Not enough memory to store list of projects.");
-
- /***** Get the projects codes *****/
- for (NumPrj = 0;
- NumPrj < Gbl.Prjs.Num;
- NumPrj++)
- {
- /* Get next project code */
- row = mysql_fetch_row (mysql_res);
- if ((Gbl.Prjs.LstPrjCods[NumPrj] = Str_ConvertStrCodToLongCod (row[0])) < 0)
- Lay_ShowErrorAndExit ("Error: wrong project code.");
- }
- }
+ if (Gbl.Prjs.PreNon == 0 || // All selectors are off
+ Gbl.Prjs.HidVis == 0) // All selectors are off
+ Gbl.Prjs.Num = 0; // Nothing to get from database
else
- Gbl.Prjs.Num = 0;
+ {
+ /* Preassigned subquery */
+ switch (Gbl.Prjs.PreNon)
+ {
+ case (1 << Prj_PREASSIGNED):
+ Str_Copy (PreNonSubQuery," AND projects.Preassigned='Y'",
+ Prj_MAX_BYTES_SUBQUERY); // Preassigned projects
+ break;
+ case (1 << Prj_NONPREASSIG):
+ Str_Copy (PreNonSubQuery," AND projects.Preassigned='N'",
+ Prj_MAX_BYTES_SUBQUERY); // Non-preassigned projects
+ break;
+ default:
+ HidVisSubQuery[0] = '\0'; // All projects
+ break;
+ }
- /***** Free structure that stores the query result *****/
- DB_FreeMySQLResult (&mysql_res);
+ /* Hidden subquery */
+ switch (Gbl.Usrs.Me.Role.Logged)
+ {
+ case Rol_STD: // Students can view only visible projects
+ Str_Copy (HidVisSubQuery," AND projects.Hidden='N'",
+ Prj_MAX_BYTES_SUBQUERY); // Visible projects
+ break;
+ case Rol_NET:
+ case Rol_TCH:
+ case Rol_SYS_ADM:
+ switch (Gbl.Prjs.HidVis)
+ {
+ case (1 << Prj_HIDDEN):
+ Str_Copy (HidVisSubQuery," AND projects.Hidden='Y'",
+ Prj_MAX_BYTES_SUBQUERY); // Hidden projects
+ break;
+ case (1 << Prj_VISIBL):
+ Str_Copy (HidVisSubQuery," AND projects.Hidden='N'",
+ Prj_MAX_BYTES_SUBQUERY); // Visible projects
+ break;
+ default:
+ HidVisSubQuery[0] = '\0'; // All projects
+ break;
+ }
+ break;
+ default:
+ Lay_ShowErrorAndExit ("Wrong role.");
+ break;
+ }
+
+ /* Order subquery */
+ switch (Gbl.Prjs.SelectedOrder)
+ {
+ case Prj_ORDER_START_TIME:
+ sprintf (OrderBySubQuery,"projects.CreatTime DESC,"
+ "projects.ModifTime DESC,"
+ "projects.Title");
+ break;
+ case Prj_ORDER_END_TIME:
+ sprintf (OrderBySubQuery,"projects.ModifTime DESC,"
+ "projects.CreatTime DESC,"
+ "projects.Title");
+ break;
+ case Prj_ORDER_TITLE:
+ sprintf (OrderBySubQuery,"projects.Title,"
+ "projects.CreatTime DESC,"
+ "projects.ModifTime DESC");
+ break;
+ case Prj_ORDER_DEPARTMENT:
+ sprintf (OrderBySubQuery,"departments.FullName,"
+ "projects.CreatTime DESC,"
+ "projects.ModifTime DESC,"
+ "projects.Title");
+ break;
+ }
+
+ /* Query */
+ if (Gbl.Prjs.My_All == Prj_MY__PROJECTS)
+ switch (Gbl.Prjs.SelectedOrder)
+ {
+ case Prj_ORDER_START_TIME:
+ case Prj_ORDER_END_TIME:
+ case Prj_ORDER_TITLE:
+ sprintf (Query,"SELECT projects.PrjCod"
+ " FROM projects,prj_usr"
+ " WHERE projects.CrsCod=%ld"
+ "%s%s"
+ " AND projects.PrjCod=prj_usr.PrjCod"
+ " AND prj_usr.UsrCod=%ld"
+ " ORDER BY %s",
+ Gbl.CurrentCrs.Crs.CrsCod,
+ PreNonSubQuery,HidVisSubQuery,
+ Gbl.Usrs.Me.UsrDat.UsrCod,
+ OrderBySubQuery);
+ break;
+ case Prj_ORDER_DEPARTMENT:
+ sprintf (Query,"SELECT projects.PrjCod"
+ " FROM prj_usr,projects LEFT JOIN departments"
+ " ON projects.DptCod=departments.DptCod"
+ " WHERE projects.CrsCod=%ld"
+ "%s%s"
+ " AND projects.PrjCod=prj_usr.PrjCod"
+ " AND prj_usr.UsrCod=%ld"
+ " ORDER BY %s",
+ Gbl.CurrentCrs.Crs.CrsCod,
+ PreNonSubQuery,HidVisSubQuery,
+ Gbl.Usrs.Me.UsrDat.UsrCod,
+ OrderBySubQuery);
+ break;
+ }
+ else // Gbl.Prjs.My_All == Prj_ALL_PROJECTS
+ switch (Gbl.Prjs.SelectedOrder)
+ {
+ case Prj_ORDER_START_TIME:
+ case Prj_ORDER_END_TIME:
+ case Prj_ORDER_TITLE:
+ sprintf (Query,"SELECT projects.PrjCod"
+ " FROM projects"
+ " WHERE projects.CrsCod=%ld"
+ "%s%s"
+ " ORDER BY %s",
+ Gbl.CurrentCrs.Crs.CrsCod,
+ PreNonSubQuery,HidVisSubQuery,
+ OrderBySubQuery);
+ break;
+ case Prj_ORDER_DEPARTMENT:
+ sprintf (Query,"SELECT projects.PrjCod"
+ " FROM projects LEFT JOIN departments"
+ " ON projects.DptCod=departments.DptCod"
+ " WHERE projects.CrsCod=%ld"
+ "%s%s"
+ " ORDER BY %s",
+ Gbl.CurrentCrs.Crs.CrsCod,
+ PreNonSubQuery,HidVisSubQuery,
+ OrderBySubQuery);
+ break;
+ }
+
+ NumRows = DB_QuerySELECT (Query,&mysql_res,"can not get projects");
+
+ if (NumRows) // Projects found...
+ {
+ Gbl.Prjs.Num = (unsigned) NumRows;
+
+ /***** Create list of projects *****/
+ if ((Gbl.Prjs.LstPrjCods = (long *) calloc (NumRows,sizeof (long))) == NULL)
+ Lay_ShowErrorAndExit ("Not enough memory to store list of projects.");
+
+ /***** Get the projects codes *****/
+ for (NumPrj = 0;
+ NumPrj < Gbl.Prjs.Num;
+ NumPrj++)
+ {
+ /* Get next project code */
+ row = mysql_fetch_row (mysql_res);
+ if ((Gbl.Prjs.LstPrjCods[NumPrj] = Str_ConvertStrCodToLongCod (row[0])) < 0)
+ Lay_ShowErrorAndExit ("Error: wrong project code.");
+ }
+ }
+ else
+ Gbl.Prjs.Num = 0;
+
+ /***** Free structure that stores the query result *****/
+ DB_FreeMySQLResult (&mysql_res);
+ }
Gbl.Prjs.LstIsRead = true;
}
@@ -2139,11 +2380,12 @@ static void Prj_GetDataOfProject (struct Project *Prj,const char *Query)
Prj->DptCod = Str_ConvertStrCodToLongCod (row[2]);
/* Get whether the project is hidden or not (row[3]) */
- Prj->Hidden = (row[3][0] == 'Y');
+ Prj->Hidden = (row[3][0] == 'Y') ? Prj_HIDDEN :
+ Prj_VISIBL;
/* Get if project is preassigned or not (row[4]) */
Prj->Preassigned = (row[4][0] == 'Y') ? Prj_PREASSIGNED :
- Prj_NOT_PREASSIGNED;
+ Prj_NONPREASSIG;
/* Get if project is preassigned or not (row[5]) */
NumLong = Str_ConvertStrCodToLongCod (row[5]);
@@ -2203,8 +2445,8 @@ static void Prj_ResetProject (struct Project *Prj)
if (Prj->PrjCod <= 0) // If > 0 ==> keep value
Prj->PrjCod = -1L;
Prj->CrsCod = -1L;
- Prj->Hidden = false;
- Prj->Preassigned = Prj_PREASSIGNED_DEFAULT;
+ Prj->Hidden = Prj_NEW_PRJ_HIDDEN_VISIBL_DEFAULT;
+ Prj->Preassigned = Prj_NEW_PRJ_PREASSIGNED_NONPREASSIG_DEFAULT;
Prj->NumStds = 1;
Prj->Proposal = Prj_PROPOSAL_DEFAULT;
Prj->CreatTime =
@@ -2266,9 +2508,7 @@ void Prj_ReqRemProject (void)
Prj_AllocMemProject (&Prj);
/***** Get parameters *****/
- Prj_GetParamPrjOrder ();
- Prj_GetParamWhichPrjs ();
- Gbl.Prjs.CurrentPage = Pag_GetParamPagNum (Pag_PROJECTS);
+ Prj_GetParams ();
if ((Prj.PrjCod = Prj_GetParamPrjCod ()) < 0)
Lay_ShowErrorAndExit ("Code of project is missing.");
@@ -2278,11 +2518,11 @@ void Prj_ReqRemProject (void)
if (Prj_CheckIfICanEditProject (Prj.PrjCod))
{
/***** Show question and button to remove the project *****/
- Gbl.Prjs.PrjCodToEdit = Prj.PrjCod;
+ Gbl.Prjs.PrjCod = Prj.PrjCod;
sprintf (Gbl.Alert.Txt,Txt_Do_you_really_want_to_remove_the_project_X,
Prj.Title);
Ale_ShowAlertAndButton (Ale_QUESTION,Gbl.Alert.Txt,
- ActRemPrj,NULL,NULL,Prj_PutParams,
+ ActRemPrj,NULL,NULL,Prj_PutCurrentParams,
Btn_REMOVE_BUTTON,Txt_Remove_project);
}
else
@@ -2310,9 +2550,7 @@ void Prj_RemoveProject (void)
Prj_AllocMemProject (&Prj);
/***** Get parameters *****/
- Prj_GetParamPrjOrder ();
- Prj_GetParamWhichPrjs ();
- Gbl.Prjs.CurrentPage = Pag_GetParamPagNum (Pag_PROJECTS);
+ Prj_GetParams ();
if ((Prj.PrjCod = Prj_GetParamPrjCod ()) < 0)
Lay_ShowErrorAndExit ("Code of project is missing.");
@@ -2375,9 +2613,7 @@ void Prj_HideProject (void)
Prj_AllocMemProject (&Prj);
/***** Get parameters *****/
- Prj_GetParamPrjOrder ();
- Prj_GetParamWhichPrjs ();
- Gbl.Prjs.CurrentPage = Pag_GetParamPagNum (Pag_PROJECTS);
+ Prj_GetParams ();
if ((Prj.PrjCod = Prj_GetParamPrjCod ()) < 0)
Lay_ShowErrorAndExit ("Code of project is missing.");
@@ -2421,9 +2657,7 @@ void Prj_ShowProject (void)
Prj_AllocMemProject (&Prj);
/***** Get parameters *****/
- Prj_GetParamPrjOrder ();
- Prj_GetParamWhichPrjs ();
- Gbl.Prjs.CurrentPage = Pag_GetParamPagNum (Pag_PROJECTS);
+ Prj_GetParams ();
if ((Prj.PrjCod = Prj_GetParamPrjCod ()) < 0)
Lay_ShowErrorAndExit ("Code of project is missing.");
@@ -2484,9 +2718,7 @@ static void Prj_RequestCreatOrEditPrj (long PrjCod)
Prj_AllocMemProject (&Prj);
/***** Get parameters *****/
- Prj_GetParamPrjOrder ();
- Prj_GetParamWhichPrjs ();
- Gbl.Prjs.CurrentPage = Pag_GetParamPagNum (Pag_PROJECTS);
+ Prj_GetParams ();
ItsANewProject = ((Prj.PrjCod = PrjCod) < 0);
/***** Get from the database the data of the project *****/
@@ -2541,13 +2773,13 @@ static void Prj_PutFormProject (struct Project *Prj,bool ItsANewProject)
/***** Start project box *****/
if (ItsANewProject)
{
- Gbl.Prjs.PrjCodToEdit = -1L;
+ Gbl.Prjs.PrjCod = -1L;
Box_StartBox (NULL,Txt_New_project,NULL,
Hlp_ASSESSMENT_Projects_new_project,Box_NOT_CLOSABLE);
}
else
{
- Gbl.Prjs.PrjCodToEdit = Prj->PrjCod;
+ Gbl.Prjs.PrjCod = Prj->PrjCod;
Box_StartBox (NULL,
Prj->Title[0] ? Prj->Title :
Txt_Edit_project,
@@ -2572,7 +2804,7 @@ static void Prj_PutFormProject (struct Project *Prj,bool ItsANewProject)
/* Start data form */
Act_FormStart (ItsANewProject ? ActNewPrj :
ActChgPrj);
- Prj_PutParams ();
+ Prj_PutCurrentParams ();
/* Start box and table */
Box_StartBoxTable (NULL,Txt_Data,NULL,
@@ -2615,16 +2847,16 @@ static void Prj_PutFormProject (struct Project *Prj,bool ItsANewProject)
The_ClassForm[Gbl.Prefs.Theme],
Txt_Preassigned_QUESTION);
- fprintf (Gbl.F.Out,"",Txt_No);
-
fprintf (Gbl.F.Out,"",Txt_Yes);
+ fprintf (Gbl.F.Out,"",Txt_No);
+
fprintf (Gbl.F.Out,""
"