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 15.60.1

This commit is contained in:
Antonio Cañas Vargas 2015-12-07 23:56:03 +01:00
parent 52a13bbcbe
commit 55fdbc5a94
6 changed files with 35 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
swad_assignment.c
View File

@ -500,7 +500,7 @@ static void Asg_PutFormsToRemEditOneAsg (long AsgCod,bool Hidden)
Asg_PutHiddenParamAsgOrderType (); Asg_PutHiddenParamAsgOrderType ();
Grp_PutParamWhichGrps (); Grp_PutParamWhichGrps ();
Pag_PutHiddenParamPagNum (Gbl.Pag.CurrentPage); Pag_PutHiddenParamPagNum (Gbl.Pag.CurrentPage);
Act_PutIconLink ("delon",Txt_Remove); Act_PutIconLink ("delon16x16.gif",Txt_Remove);
/***** Put form to hide/show assignment *****/ /***** Put form to hide/show assignment *****/
Act_FormStart (Hidden ? ActShoAsg : Act_FormStart (Hidden ? ActShoAsg :
@ -510,9 +510,9 @@ static void Asg_PutFormsToRemEditOneAsg (long AsgCod,bool Hidden)
Grp_PutParamWhichGrps (); Grp_PutParamWhichGrps ();
Pag_PutHiddenParamPagNum (Gbl.Pag.CurrentPage); Pag_PutHiddenParamPagNum (Gbl.Pag.CurrentPage);
if (Hidden) if (Hidden)
Act_PutIconLink ("hidden_on",Txt_Show); Act_PutIconLink ("hidden_on16x16.gif",Txt_Show);
else else
Act_PutIconLink ("visible_on",Txt_Hide); Act_PutIconLink ("visible_on16x16.gif",Txt_Hide);
/***** Put form to edit assignment *****/ /***** Put form to edit assignment *****/
Act_FormStart (ActEdiOneAsg); Act_FormStart (ActEdiOneAsg);
@ -520,7 +520,7 @@ static void Asg_PutFormsToRemEditOneAsg (long AsgCod,bool Hidden)
Asg_PutHiddenParamAsgOrderType (); Asg_PutHiddenParamAsgOrderType ();
Grp_PutParamWhichGrps (); Grp_PutParamWhichGrps ();
Pag_PutHiddenParamPagNum (Gbl.Pag.CurrentPage); Pag_PutHiddenParamPagNum (Gbl.Pag.CurrentPage);
Act_PutIconLink ("edit",Txt_Edit); Act_PutIconLink ("edit16x16.gif",Txt_Edit);
fprintf (Gbl.F.Out,"</div>"); fprintf (Gbl.F.Out,"</div>");
} }

8
swad_attendance.c
View File

@ -528,7 +528,7 @@ static void Att_PutFormsToRemEditOneAttEvent (long AttCod,bool Hidden)
Att_PutHiddenParamAttOrderType (); Att_PutHiddenParamAttOrderType ();
Grp_PutParamWhichGrps (); Grp_PutParamWhichGrps ();
Pag_PutHiddenParamPagNum (Gbl.Pag.CurrentPage); Pag_PutHiddenParamPagNum (Gbl.Pag.CurrentPage);
Act_PutIconLink ("delon",Txt_Remove); Act_PutIconLink ("delon16x16.gif",Txt_Remove);
/***** Put form to hide/show attendance event *****/ /***** Put form to hide/show attendance event *****/
Act_FormStart (Hidden ? ActShoAtt : Act_FormStart (Hidden ? ActShoAtt :
@ -538,9 +538,9 @@ static void Att_PutFormsToRemEditOneAttEvent (long AttCod,bool Hidden)
Grp_PutParamWhichGrps (); Grp_PutParamWhichGrps ();
Pag_PutHiddenParamPagNum (Gbl.Pag.CurrentPage); Pag_PutHiddenParamPagNum (Gbl.Pag.CurrentPage);
if (Hidden) if (Hidden)
Act_PutIconLink ("hidden_on",Txt_Show); Act_PutIconLink ("hidden_on16x16.gif",Txt_Show);
else else
Act_PutIconLink ("visible_on",Txt_Hide); Act_PutIconLink ("visible_on16x16.gif",Txt_Hide);
/***** Put form to edit attendance event *****/ /***** Put form to edit attendance event *****/
Act_FormStart (ActEdiOneAtt); Act_FormStart (ActEdiOneAtt);
@ -548,7 +548,7 @@ static void Att_PutFormsToRemEditOneAttEvent (long AttCod,bool Hidden)
Att_PutHiddenParamAttOrderType (); Att_PutHiddenParamAttOrderType ();
Grp_PutParamWhichGrps (); Grp_PutParamWhichGrps ();
Pag_PutHiddenParamPagNum (Gbl.Pag.CurrentPage); Pag_PutHiddenParamPagNum (Gbl.Pag.CurrentPage);
Act_PutIconLink ("edit",Txt_Edit); Act_PutIconLink ("edit16x16.gif",Txt_Edit);
fprintf (Gbl.F.Out,"</div>"); fprintf (Gbl.F.Out,"</div>");
} }

4
swad_changelog.h
View File

@ -112,12 +112,14 @@
/****************************** Public constants *****************************/ /****************************** Public constants *****************************/
/*****************************************************************************/ /*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 15.60 (2015/12/07)" #define Log_PLATFORM_VERSION "SWAD 15.60.1 (2015/12/07)"
#define CSS_FILE "swad15.59.4.css" #define CSS_FILE "swad15.59.4.css"
// 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 15.60.1: Dec 07, 2015 Fixed names of some small icons.
New link in student's record card to see her/his attendance. (? lines)
Version 15.60: Dec 07, 2015 By default, the language of a new user is unknown. Version 15.60: Dec 07, 2015 By default, the language of a new user is unknown.
Fixed bugs when registering a new user. (? lines) Fixed bugs when registering a new user. (? lines)
Version 15.59.4: Dec 06, 2015 Changes in some small icons. (186462 lines) Version 15.59.4: Dec 06, 2015 Changes in some small icons. (186462 lines)

6
swad_exam.c
View File

@ -775,18 +775,18 @@ static void Exa_ShowExamAnnouncement (long ExaCod,Exa_TypeViewExamAnnouncement_t
/***** Link to remove this exam announcement *****/ /***** Link to remove this exam announcement *****/
Act_FormStart (ActRemExaAnn); Act_FormStart (ActRemExaAnn);
Par_PutHiddenParamLong ("ExaCod",ExaCod); Par_PutHiddenParamLong ("ExaCod",ExaCod);
Act_PutIconLink ("delon",Txt_Remove); Act_PutIconLink ("delon16x16.gif",Txt_Remove);
/***** Link to edit this exam announcement *****/ /***** Link to edit this exam announcement *****/
Act_FormStart (ActEdiExaAnn); Act_FormStart (ActEdiExaAnn);
Par_PutHiddenParamLong ("ExaCod",ExaCod); Par_PutHiddenParamLong ("ExaCod",ExaCod);
Act_PutIconLink ("edit",Txt_Edit); Act_PutIconLink ("edit16x16.gif",Txt_Edit);
} }
/***** Link to print view *****/ /***** Link to print view *****/
Act_FormStart (ActPrnExaAnn); Act_FormStart (ActPrnExaAnn);
Par_PutHiddenParamLong ("ExaCod",ExaCod); Par_PutHiddenParamLong ("ExaCod",ExaCod);
Act_PutIconLink ("print",Txt_Print); Act_PutIconLink ("print16x16.gif",Txt_Print);
fprintf (Gbl.F.Out,"</td>" fprintf (Gbl.F.Out,"</td>"
"</tr>"); "</tr>");

25
swad_record.c
View File

@ -2257,7 +2257,7 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
Act_FormEnd (); Act_FormEnd ();
} }
if (Gbl.CurrentCrs.Crs.CrsCod > 0 && // A course is selected if (Gbl.CurrentCrs.Crs.CrsCod > 0 && // A course is selected
UsrDat->RoleInCurrentCrsDB == Rol_STUDENT && // He/she is a student in the current course UsrDat->RoleInCurrentCrsDB == Rol_STUDENT && // He/she is a student in the current course
(ItsMe || IAmLoggedAsTeacher || IAmLoggedAsSysAdm)) // I can view (ItsMe || IAmLoggedAsTeacher || IAmLoggedAsSysAdm)) // I can view
{ {
@ -2307,12 +2307,20 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
Act_FormEnd (); Act_FormEnd ();
/***** Button to view user's attendance *****/ /***** Button to view user's attendance *****/
// TODO: A student should see her/his attendance if (IAmLoggedAsStudent ||
if (IAmLoggedAsTeacher || IAmLoggedAsSysAdm) IAmLoggedAsTeacher ||
IAmLoggedAsSysAdm)
{ {
Act_FormStart (ActSeeLstStdAtt); if (IAmLoggedAsStudent)
Par_PutHiddenParamString ("UsrCodStd",UsrDat->EncryptedUsrCod); // As student, I can see my attendance
Grp_PutParamAllGroups (); Act_FormStart (ActSeeLstMyAtt);
else // IAmLoggedAsTeacher || IAmLoggedAsSysAdm
{
// As teacher, I can see attendance of the student
Act_FormStart (ActSeeLstStdAtt);
Par_PutHiddenParamString ("UsrCodStd",UsrDat->EncryptedUsrCod);
Grp_PutParamAllGroups ();
}
Act_LinkFormSubmit (Txt_Attendance,ClassData); Act_LinkFormSubmit (Txt_Attendance,ClassData);
fprintf (Gbl.F.Out,"<div class=\"ICON_HIGHLIGHT\"" fprintf (Gbl.F.Out,"<div class=\"ICON_HIGHLIGHT\""
" style=\"display:inline;\" >" " style=\"display:inline;\" >"
@ -2823,9 +2831,8 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
fprintf (Gbl.F.Out,">%s</option>", fprintf (Gbl.F.Out,">%s</option>",
Gbl.Ctys.Lst[NumCty].Name[Gbl.Prefs.Language]); Gbl.Ctys.Lst[NumCty].Name[Gbl.Prefs.Language]);
} }
fprintf (Gbl.F.Out,"</select>"); fprintf (Gbl.F.Out,"</select>"
"</td>"
fprintf (Gbl.F.Out,"</td>"
"</tr>"); "</tr>");
} }
} }

10
swad_survey.c
View File

@ -734,7 +734,7 @@ static void Svy_PutFormsToRemEditOneSvy (long SvyCod,bool Visible)
Svy_PutHiddenParamSvyOrderType (); Svy_PutHiddenParamSvyOrderType ();
Grp_PutParamWhichGrps (); Grp_PutParamWhichGrps ();
Pag_PutHiddenParamPagNum (Gbl.Pag.CurrentPage); Pag_PutHiddenParamPagNum (Gbl.Pag.CurrentPage);
Act_PutIconLink ("delon",Txt_Remove); Act_PutIconLink ("delon16x16.gif",Txt_Remove);
/***** Put form to reset survey *****/ /***** Put form to reset survey *****/
Act_FormStart (ActReqRstSvy); Act_FormStart (ActReqRstSvy);
@ -742,7 +742,7 @@ static void Svy_PutFormsToRemEditOneSvy (long SvyCod,bool Visible)
Svy_PutHiddenParamSvyOrderType (); Svy_PutHiddenParamSvyOrderType ();
Grp_PutParamWhichGrps (); Grp_PutParamWhichGrps ();
Pag_PutHiddenParamPagNum (Gbl.Pag.CurrentPage); Pag_PutHiddenParamPagNum (Gbl.Pag.CurrentPage);
Act_PutIconLink ("reset",Txt_Reset); Act_PutIconLink ("reset16x16.gif",Txt_Reset);
/***** Put form to hide/show survey *****/ /***** Put form to hide/show survey *****/
Act_FormStart (Visible ? ActHidSvy : Act_FormStart (Visible ? ActHidSvy :
@ -752,9 +752,9 @@ static void Svy_PutFormsToRemEditOneSvy (long SvyCod,bool Visible)
Grp_PutParamWhichGrps (); Grp_PutParamWhichGrps ();
Pag_PutHiddenParamPagNum (Gbl.Pag.CurrentPage); Pag_PutHiddenParamPagNum (Gbl.Pag.CurrentPage);
if (Visible) if (Visible)
Act_PutIconLink ("visible_on",Txt_Hide); Act_PutIconLink ("visible_on16x16.gif",Txt_Hide);
else else
Act_PutIconLink ("hidden_on",Txt_Show); Act_PutIconLink ("hidden_on16x16.gif",Txt_Show);
/***** Put form to edit survey *****/ /***** Put form to edit survey *****/
Act_FormStart (ActEdiOneSvy); Act_FormStart (ActEdiOneSvy);
@ -762,7 +762,7 @@ static void Svy_PutFormsToRemEditOneSvy (long SvyCod,bool Visible)
Svy_PutHiddenParamSvyOrderType (); Svy_PutHiddenParamSvyOrderType ();
Grp_PutParamWhichGrps (); Grp_PutParamWhichGrps ();
Pag_PutHiddenParamPagNum (Gbl.Pag.CurrentPage); Pag_PutHiddenParamPagNum (Gbl.Pag.CurrentPage);
Act_PutIconLink ("edit",Txt_Edit); Act_PutIconLink ("edit16x16.gif",Txt_Edit);
fprintf (Gbl.F.Out,"</div>"); fprintf (Gbl.F.Out,"</div>");
} }