Index: eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/admin/ManageTeams.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/admin/ManageTeams.java (revision 99e3758f1124a6d235e4ed2293c73abea47268e0) +++ eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/admin/ManageTeams.java (revision 7e66d9ed0657302cae875d8270050389dedd96f0) @@ -30,4 +30,5 @@ import org.apache.tapestry5.ioc.annotations.Inject; +import info.ajanovski.eprms.model.entities.Responsibility; import info.ajanovski.eprms.model.entities.Team; import info.ajanovski.eprms.model.entities.TeamMember; @@ -48,4 +49,23 @@ private GenericService genericService; + @Property + private Team team; + + @Property + private TeamMember teamMember; + + @Persist + @Property + private Boolean approvalOnly; + + @Property + private Responsibility responsibility; + + public void onActivate() { + if (approvalOnly == null) { + approvalOnly = true; + } + } + public List getTeams() { List lista = (List) genericService.getAll(Team.class); @@ -58,14 +78,4 @@ } } - - @Property - private Team team; - - @Property - private TeamMember teamMember; - - @Persist - @Property - private Boolean approvalOnly; void onActionFromToggleApprovalOnly() { @@ -89,3 +99,15 @@ } + @CommitAfter + void onActionFromRemoveTeam(Team t) { + for (TeamMember tm : t.getTeamMembers()) { + genericService.delete(tm); + } + genericService.delete(t); + } + + public List getTeamResponsibilities() { + return team.getResponsibilities(); + } + } Index: eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/admin/OverallCourseReport.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/admin/OverallCourseReport.java (revision 99e3758f1124a6d235e4ed2293c73abea47268e0) +++ eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/admin/OverallCourseReport.java (revision 7e66d9ed0657302cae875d8270050389dedd96f0) @@ -2,5 +2,4 @@ import java.util.ArrayList; -import java.util.Collections; import java.util.Date; import java.util.List; @@ -19,4 +18,5 @@ import org.apache.tapestry5.services.SelectModelFactory; import org.apache.tapestry5.services.ajax.AjaxResponseRenderer; +import org.hibernate.Session; import org.slf4j.Logger; @@ -29,18 +29,20 @@ import info.ajanovski.eprms.model.entities.WorkReport; import info.ajanovski.eprms.model.util.CourseActivityTypeHierarchicalComparator; -import info.ajanovski.eprms.model.util.CourseComparator; import info.ajanovski.eprms.model.util.ModelConstants; -import info.ajanovski.eprms.model.util.WorkEvaluationComparator; import info.ajanovski.eprms.mq.MessagingService; import info.ajanovski.eprms.tap.annotations.AdministratorPage; import info.ajanovski.eprms.tap.annotations.InstructorPage; +import info.ajanovski.eprms.tap.services.CourseManager; import info.ajanovski.eprms.tap.services.GenericService; import info.ajanovski.eprms.tap.services.ProjectManager; +import info.ajanovski.eprms.tap.services.SystemConfigService; import info.ajanovski.eprms.tap.util.AppConfig; +import info.ajanovski.eprms.tap.util.AppConstants; import info.ajanovski.eprms.tap.util.UserInfo; @InstructorPage @AdministratorPage -@Import(module = { "bootstrap/modal", "bootstrap/collapse", "zoneUpdateEffect" }) +@Import(module = { "bootstrap/modal", "bootstrap/collapse", + "zoneUpdateEffect" }, stylesheet = "OverallCourseReport.css") public class OverallCourseReport { @SessionState @@ -52,7 +54,13 @@ @Inject + private SystemConfigService systemConfigService; + + @Inject private ProjectManager projectManager; @Inject + private CourseManager courseManager; + + @Inject private MessagingService messagingService; @@ -69,29 +77,39 @@ private SelectModelFactory selectModelFactory; + @Persist + @Property + private Course selectedCourse; + + @Property + private CourseActivityType courseActivityType; + + @Property + private WorkReport workReport; + + @Property + private WorkEvaluation workEvaluation; + + @Persist + @Property + private WorkReport newWorkReport; + + @Persist + @Property + private WorkEvaluation newWorkEvaluation; + @InjectComponent - private Zone zNewWorkReportModal, zNewWorkEvaluationModal, zTable; - - @Persist - @Property - private Course selectedCourse; - - @Property - private CourseActivityType courseActivityType; - - @Property - private WorkReport workReport; - - @Property - private WorkEvaluation workEvaluation; - - @Persist - @Property - private WorkReport newWorkReport; - - @Persist - @Property - private WorkEvaluation newWorkEvaluation; - - public List getAllProjects() { + private Zone zWorkReport; + + @InjectComponent + private Zone zTable; + + @Persist + @Property + private List projectsToHide; + + @Property + private Project hiddenProject; + + public List getListOfAllActiveProjects() { List list = new ArrayList(); if (selectedCourse == null) { @@ -104,4 +122,7 @@ .collect(Collectors.toList()); } + if (projectsToHide != null && projectsToHide.size() > 0) { + list.removeIf(l -> projectsToHide.stream().anyMatch(ph -> ph.getProjectId() == l.getProjectId())); + } return list; } @@ -133,21 +154,24 @@ } - public void onAddWorkReport(Activity a) { + public void onActionFromAddWorkReport(Activity a) { newWorkEvaluation = null; newWorkReport = new WorkReport(); newWorkReport.setActivity(a); if (request.isXHR()) { - ajaxResponseRenderer.addRender(zNewWorkReportModal); + ajaxResponseRenderer.addRender(zWorkReport); } } @CommitAfter - public void onSuccessFromFrmAddWorkReport() { + void onSuccessFromFrmAddWorkReport() { genericService.saveOrUpdate(newWorkReport); newWorkReport = null; newWorkEvaluation = null; - } - - public void onAddWorkEvaluation(WorkReport wr) { + if (request.isXHR()) { + ajaxResponseRenderer.addRender("zWorkReport", zWorkReport).addRender("zTable", zTable); + } + } + + void onAddWorkEvaluation(WorkReport wr) { WorkReport wr1 = genericService.getByPK(WorkReport.class, wr.getWorkReportId()); newWorkReport = null; @@ -157,19 +181,13 @@ newWorkEvaluation.setStatus(ModelConstants.EvaluationStatusCreated); newWorkEvaluation.setWorkReport(wr1); - if (request.isXHR()) { - ajaxResponseRenderer.addRender(zNewWorkEvaluationModal); - } - } - - public void onEditWorkEvaluation(WorkEvaluation wa) { + } + + void onEditWorkEvaluation(WorkEvaluation wa) { newWorkReport = null; newWorkEvaluation = wa; - if (request.isXHR()) { - ajaxResponseRenderer.addRender(zNewWorkEvaluationModal); - } } @CommitAfter - public void onToggleWorkEvaluationStatus(WorkEvaluation wa) { + void onToggleWorkEvaluationStatus(WorkEvaluation wa) { if (wa.getStatus().equals(ModelConstants.EvaluationStatusCreated)) { wa.setStatus(ModelConstants.EvaluationStatusPublished); @@ -183,10 +201,24 @@ } + public String getZWorkEvaluationId() { + return "zWorkEvaluation_" + workEvaluation.getWorkEvaluationId(); + } + + public String getZWorkEvaluationIdNew() { + return "zWorkEvaluation_" + newWorkEvaluation.getWorkEvaluationId(); + } + @CommitAfter public void onSuccessFromFrmAddWorkEvaluation() { genericService.saveOrUpdate(newWorkEvaluation); - messagingService.sendWorkEvaluationNotification(newWorkEvaluation); - newWorkReport = null; - newWorkEvaluation = null; + // messagingService.sendWorkEvaluationNotification(newWorkEvaluation); + String ident = getZWorkEvaluationIdNew(); + logger.info("zone id = {}", ident); + newWorkReport = null; + newWorkEvaluation = null; + } + + public void onActionFromResetListOfAllProjects() { + projectsToHide.clear(); } @@ -200,11 +232,11 @@ public List getAllCourses() { - List lista = (List) genericService.getAll(Course.class); - CourseComparator cc = new CourseComparator(); - Collections.sort(lista, cc); - return lista; + return courseManager.getAllCoursesByPerson(userInfo.getPersonId()); } public void onActivate() { + if (projectsToHide == null) { + projectsToHide = new ArrayList(); + } if (selectedCourse != null) { selectedCourse = genericService.getByPK(Course.class, selectedCourse.getCourseId()); @@ -217,3 +249,31 @@ } + void onActionFromRemoveProjectFromListOfAllProjects(Project p) { + projectsToHide.add(p); + } + + void onActionFromShowProject(Project p) { + projectsToHide.removeIf(ph -> ph.getProjectId() == p.getProjectId()); + } + + void onActionFromHideAllProjects() { + List lista = getListOfAllActiveProjects(); + projectsToHide.addAll(lista); + } + + public void onActionFromCancelNewWorkReport() { + newWorkReport = null; + } + + public void onActionFromCancelNewWorkEvaluation() { + newWorkEvaluation = null; + } + + public String[] getEvalStatusModel() { + return ModelConstants.AllEvaluationStatuses; + } + + public String getPMProjectURLPrefix() { + return systemConfigService.getString(AppConstants.SystemParameterPMProjectURLPrefix); + } } Index: eprms-tap/src/main/resources/META-INF/assets/OverallCourseReport.css =================================================================== --- eprms-tap/src/main/resources/META-INF/assets/OverallCourseReport.css (revision 7e66d9ed0657302cae875d8270050389dedd96f0) +++ eprms-tap/src/main/resources/META-INF/assets/OverallCourseReport.css (revision 7e66d9ed0657302cae875d8270050389dedd96f0) @@ -0,0 +1,58 @@ +.CREATED { + background-color: #ffc0c0ff !important; + color: #000000ff !important; +} + +.report { + min-height: 5rem; + max-height: 10rem; + overflow: auto; + font-size: 75%; +} + +.evaluation { + font-size: 85%; + max-height: 12.5rem; + overflow: auto; +} + +table { + margin: 0; + table-layout: fixed; +} + +table thead th { + position: sticky; + top: 3.5em; + z-index: 1; + width: 18vw; + background: white; +} + +table thead th:first-child { + position: sticky; + left: 0; + z-index: 2; + width: 8vw; +} + +table td { + background: #fff; +} + +table tbody th { + position: relative; +} + +table tbody th { + position: sticky; + left: 0; + background: #eee; + z-index: 1; +} + +[role="region"][aria-labelledby][tabindex] { + width: 100%; + max-height: 98vh; + overflow: auto; +} Index: eprms-tap/src/main/resources/META-INF/assets/site-overrides.css =================================================================== --- eprms-tap/src/main/resources/META-INF/assets/site-overrides.css (revision 99e3758f1124a6d235e4ed2293c73abea47268e0) +++ eprms-tap/src/main/resources/META-INF/assets/site-overrides.css (revision 7e66d9ed0657302cae875d8270050389dedd96f0) @@ -2,34 +2,48 @@ --ck-z-default: 100; --ck-z-modal: calc( var(--ck-z-default) + 999 ); - - /* https://www.w3schools.com/colors/colors_british.asp - Carnival red */ - --color-incorrect: #c71c2c; - - /* https://www.w3schools.com/colors/colors_british.asp - Bright green / Goblin / Garland */ - --color-correct: #74b979; - + --color-incorrect-wrong: #600f16ff; + --color-incorrect: #e1553eff; /* https://www.w3schools.com/colors/colors_british.asp - Carnival red */ + --color-correct: #74b979ff; /* https://www.w3schools.com/colors/colors_british.asp - Bright green / Goblin / Garland */ + --color-correct-better: #484837ff; /* https://www.w3schools.com/colors/colors_british.asp - Olive gree */ --color-noevaluation: #white; --color-exception: #404040; } +@media (prefers-color-scheme: dark) { + :root { + --main-bg-color: #260661ff; + --main-bg-color2: #260661ff; + --main-bg-color3: #42119cff; + --main-bg-color-box: #42119cff; + --main-bg-color-accent: #330B7Dff; + --main-bg-color-accent2: #00000080; + --main-font-color: white; + --main-font-color-hover: #E9FA5A; + --main-link-color: #A074F0; + --yt-font-color: #8E6600; + --sidebar-bg-color: #260661ff; + --main-border-color: rgb(0,0,0,0.15); + --main-underline-color: rgba(255,255,255,128); + --light: #080704; + --dark: #d4dac0; + --bs-body-bg: rgb(16,16,16); + --bs-body-color: white; + --bs-light-rgb: rgba(42,42,42,0.5); + --bs-bg-opacity: rgba(42,42,42,0.5); + --color-incorrect: #7b000c; /* https://www.w3schools.com/colors/colors_british.asp - Carnival red */ + --color-correct: #277c2c; /* https://www.w3schools.com/colors/colors_british.asp - Bright green / Goblin / Garland */ + } +} -body, -h1, -h2, -h3, -h4, -h5, -h6, -.h1, -.h2, -.h3, -.h4, -.h5, -.h6 { +body, h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 { font-family: 'Fira Sans', Helvetica, Arial, sans-serif !important; } +body { + padding-top: 4.5em; +} + code { - font-family: 'Fira Mono', monospace, mono !important; + font-family: 'Fira Code', 'Fira Mono', monospace, mono !important; } @@ -59,7 +73,4 @@ padding-left:0.5rem; } - - - @keyframes slidein { Index: eprms-tap/src/main/resources/application.yml =================================================================== --- eprms-tap/src/main/resources/application.yml (revision 99e3758f1124a6d235e4ed2293c73abea47268e0) +++ eprms-tap/src/main/resources/application.yml (revision 7e66d9ed0657302cae875d8270050389dedd96f0) @@ -1,3 +1,3 @@ server: - port: 8081 + port: 8082 Index: eprms-tap/src/main/resources/info/ajanovski/eprms/tap/pages/admin/ManageTeams.tml =================================================================== --- eprms-tap/src/main/resources/info/ajanovski/eprms/tap/pages/admin/ManageTeams.tml (revision 99e3758f1124a6d235e4ed2293c73abea47268e0) +++ eprms-tap/src/main/resources/info/ajanovski/eprms/tap/pages/admin/ManageTeams.tml (revision 7e66d9ed0657302cae875d8270050389dedd96f0) @@ -20,10 +20,14 @@ t:value="team">
-

${team.name} +
-

+ ${message:remove-label} +
+

${team.name}

+

${team.statusDate}

@@ -31,11 +35,15 @@

-

${team.statusDate}

${message:openForNewMembers-label}: -  ${team.openForNewMembers} Max: ${team.maxMembers}

+  ${team.openForNewMembers} / Max members: + ${team.maxMembers} +

+

Team is Responsible for Projects

+

${responsibility.project.title}

Index: eprms-tap/src/main/resources/info/ajanovski/eprms/tap/pages/admin/OverallCourseReport.tml =================================================================== --- eprms-tap/src/main/resources/info/ajanovski/eprms/tap/pages/admin/OverallCourseReport.tml (revision 99e3758f1124a6d235e4ed2293c73abea47268e0) +++ eprms-tap/src/main/resources/info/ajanovski/eprms/tap/pages/admin/OverallCourseReport.tml (revision 7e66d9ed0657302cae875d8270050389dedd96f0) @@ -2,70 +2,9 @@ xmlns:t="http://tapestry.apache.org/schema/tapestry_5_4.xsd" xmlns:p="tapestry:parameter"> - -

${message:admin/OverallCourseReport-pagelink}

-
+ +
- - -
+ + + + + + ${message:cancel-label} + + + + +
@@ -118,13 +83,16 @@ ${message:Project-label} -

${project.title}
Home - Tickets -
Total: ${projectTotal} + href="${PMProjectURLPrefix}${project.code}">Home Tickets + Remove
+ Total: ${projectTotal}

@@ -139,5 +107,7 @@ ${courseActivityType.activityType.title} - + +

- ${workReport.title} + ${workReport.title} +
- + ${workReport?.person?.lastName} ${workReport?.person?.firstName}

@@ -155,23 +128,31 @@ t:type="loop" t:source="workEvaluationsForWorkReport" t:value="workEvaluation"> -
-
-

-

${workEvaluation.points} -

-
-
-

- ${workEvaluation.title} -

- +
+ +
+
+

+

${workEvaluation.points} +

+
+
+

+ ${workEvaluation.title} +
- + ${workEvaluation?.person?.lastName} + ${workEvaluation?.person?.firstName} + +

+ +
@@ -181,6 +162,6 @@ ${message:evaluation-label} + t:context="workReport"> + ${message:evaluation-label}

@@ -188,9 +169,11 @@

- + + +

+ @@ -203,5 +186,5 @@
-
+ Index: eprms-tap/src/main/webapp/WEB-INF/app.properties =================================================================== --- eprms-tap/src/main/webapp/WEB-INF/app.properties (revision 99e3758f1124a6d235e4ed2293c73abea47268e0) +++ eprms-tap/src/main/webapp/WEB-INF/app.properties (revision 7e66d9ed0657302cae875d8270050389dedd96f0) @@ -1,2 +1,15 @@ +responsibility-label=Responsibility of a team +create-label=Create +code-label=A unique and short code identifying your project. Used as part of the project URL. +code-regexp=^[a-zA-Z]+[a-zA-Z0-9\-\_]*[a-zA-Z0-9]+$ +code-regexp-message=code can only start with latin letters, contain _ or -, and finish with latin letters or numbers. +evaluatePostingAsATeam-label=Evaluate as a team +setAccepted-label=Accepted +evalDiscussionPostFor-label=Evaluate critique for +DiscussionPostEvaluationTypeIdea-label=Idea +DiscussionPostEvaluationTypeModel-label=Model +DiscussionPostEvaluationTypeFunctionality-label=Functionality +DiscussionPostEvaluationTypeBug-label=Bug +DiscussionPostEvaluationTypeOther-label=Other discussions-label=Discussions selectPostType-label=Select post type @@ -46,4 +59,5 @@ course-label=course database-label=Database +delete-label=Delete description-label=Description edit-label=Edit Index: eprms-tap/src/main/webapp/WEB-INF/app_mk.properties =================================================================== --- eprms-tap/src/main/webapp/WEB-INF/app_mk.properties (revision 99e3758f1124a6d235e4ed2293c73abea47268e0) +++ eprms-tap/src/main/webapp/WEB-INF/app_mk.properties (revision 7e66d9ed0657302cae875d8270050389dedd96f0) @@ -1,2 +1,15 @@ +responsibility-label=Одговорност на тим +create-label=Креирај +code-label=Уникатен и краток код кој го идентификува вашиот проект. Се употребува како дел од проектниот URL. +code-regexp=^[a-zA-Z]+[a-zA-Z0-9\-\_]*[a-zA-Z0-9]+$ +code-regexp-message=code can only start with latin letters, contain _ or -, and finish with latin letters or numbers. +evaluatePostingAsATeam-label=Евалуирај како тим +setAccepted-label=Прифатено +evalDiscussionPostFor-label=Евалуирај осврт за +DiscussionPostEvaluationTypeIdea-label=Идеја +DiscussionPostEvaluationTypeModel-label=Модел +DiscussionPostEvaluationTypeFunctionality-label=Функционалности +DiscussionPostEvaluationTypeBug-label=Баг +DiscussionPostEvaluationTypeOther-label=Друго discussions-label=Дискусии selectPostType-label=Избери тип коментар @@ -44,5 +57,5 @@ copyrightYear=2021 database-label=База на податоци -description-label=Опис +delete-label=Отстрани description-label=Опис edit-label=Измени