diff --git a/swad_changelog.h b/swad_changelog.h index 65c1b0a93..6fc0bcc88 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -252,13 +252,14 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 17.3.1 (2017-09-19)" +#define Log_PLATFORM_VERSION "SWAD 17.3.2 (2017-09-19)" #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.3.2: Sep 19, 2017 Changes in listing of projects. (230168 lines) Version 17.3.1: Sep 19, 2017 Fix bugs in projects. (230089 lines) Version 17.3: Sep 19, 2017 Changes in fields of database table used for projects. (230089 lines) 2 changes necessary in database: diff --git a/swad_project.c b/swad_project.c index 84d9407a9..75b323926 100644 --- a/swad_project.c +++ b/swad_project.c @@ -364,6 +364,9 @@ static void Prj_ShowOneProject (struct Project *Prj,bool PrintView) extern const char *Txt_PREASSIGNED_TYPES[Prj_NUM_TYPES_PREASSIGNED]; extern const char *Txt_Yes; extern const char *Txt_No; + extern const char *Txt_Description; + extern const char *Txt_Required_knowledge; + extern const char *Txt_Required_materials; static unsigned UniqueId = 0; /***** Get data of this project *****/ @@ -372,7 +375,7 @@ static void Prj_ShowOneProject (struct Project *Prj,bool PrintView) /***** Write first row of data of this project *****/ /* Forms to remove/edit this project */ fprintf (Gbl.F.Out,"" - ""); else @@ -463,10 +466,7 @@ static void Prj_ShowOneProject (struct Project *Prj,bool PrintView) fprintf (Gbl.F.Out,""); - /* Description of the project */ - Str_ChangeFormat (Str_FROM_HTML,Str_TO_RIGOROUS_HTML, - Prj->Description,Cns_MAX_BYTES_TEXT,false); // Convert from HTML to recpectful HTML - Str_InsertLinks (Prj->Description,Cns_MAX_BYTES_TEXT,60); // Insert links + /* Groups of the project */ fprintf (Gbl.F.Out,"" + fprintf (Gbl.F.Out,"" + ""); + + /* Description of the project */ + Str_ChangeFormat (Str_FROM_HTML,Str_TO_RIGOROUS_HTML, + Prj->Description,Cns_MAX_BYTES_TEXT,false); // Convert from HTML to recpectful HTML + Str_InsertLinks (Prj->Description,Cns_MAX_BYTES_TEXT,60); // Insert links + + fprintf (Gbl.F.Out,"" + "" + "

" + "%s:" + "

" + "" + "Hidden ? "DAT_LIGHT" : + "DAT_N", + Txt_Description); + if (!PrintView) + fprintf (Gbl.F.Out," COLOR%u",Gbl.RowEvenOdd); + fprintf (Gbl.F.Out,"\">" + "

" "%s" "

" "" @@ -484,6 +508,66 @@ static void Prj_ShowOneProject (struct Project *Prj,bool PrintView) "DAT", Prj->Description); + /* Required knowledge to carry out the project */ + Str_ChangeFormat (Str_FROM_HTML,Str_TO_RIGOROUS_HTML, + Prj->Knowledge,Cns_MAX_BYTES_TEXT,false); // Convert from HTML to recpectful HTML + Str_InsertLinks (Prj->Knowledge,Cns_MAX_BYTES_TEXT,60); // Insert links + + fprintf (Gbl.F.Out,"" + "" + "

" + "%s:" + "

" + "" + "Hidden ? "DAT_LIGHT" : + "DAT_N", + Txt_Required_knowledge); + if (!PrintView) + fprintf (Gbl.F.Out," COLOR%u",Gbl.RowEvenOdd); + fprintf (Gbl.F.Out,"\">" + "

" + "%s" + "

" + "" + "", + Prj->Hidden ? "DAT_LIGHT" : + "DAT", + Prj->Knowledge); + + /* Required materials to carry out the project */ + Str_ChangeFormat (Str_FROM_HTML,Str_TO_RIGOROUS_HTML, + Prj->Materials,Cns_MAX_BYTES_TEXT,false); // Convert from HTML to recpectful HTML + Str_InsertLinks (Prj->Materials,Cns_MAX_BYTES_TEXT,60); // Insert links + + fprintf (Gbl.F.Out,"" + "" + "

" + "%s:" + "

" + "" + "Hidden ? "DAT_LIGHT" : + "DAT_N", + Txt_Required_materials); + if (!PrintView) + fprintf (Gbl.F.Out," COLOR%u",Gbl.RowEvenOdd); + fprintf (Gbl.F.Out,"\">" + "

" + "%s" + "

" + "" + "", + Prj->Hidden ? "DAT_LIGHT" : + "DAT", + Prj->Materials); + Gbl.RowEvenOdd = 1 - Gbl.RowEvenOdd; }