Merge pull request #2056 from Siemens-Healthineers/feat/RequestPortle…

…tFeatures-2051 feat(RequestsPortlet): Added On Hold value for request status and Next/Last 15 days filter Reviewed by: anupam.ghosh@siemens.com Tested by: kumar.nikesh@siemens.com
eclipse-sw360 · Jul 26, 2023 · c5185ab · c5185ab
2 parents a6d0c7c + 4d4c863
commit c5185ab
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 0 deletions.
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/moderation/view.jsp b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/moderation/view.jsp
@@ -180,6 +180,8 @@
                             <option value="0" class="textlabel stackedLabel"><liferay-ui:message key="today" /></option>
                             <option value="-30" class="textlabel stackedLabel"><liferay-ui:message key="last.30.days" /></option>
                             <option value="-7" class="textlabel stackedLabel"><liferay-ui:message key="last.7.days" /></option>
+                            <option value="-15" class="textlabel stackedLabel"><liferay-ui:message key="last.15.days" /></option>
+                            <option value="15" class="textlabel stackedLabel"><liferay-ui:message key="next.15.days" /></option>
                             <option value="7" class="textlabel stackedLabel"><liferay-ui:message key="next.7.days" /></option>
                             <option value="30" class="textlabel stackedLabel"><liferay-ui:message key="next.30.days" /></option>
                         </select>

diff --git a/frontend/sw360-portlet/src/main/resources/content/Language.properties b/frontend/sw360-portlet/src/main/resources/content/Language.properties
@@ -782,6 +782,7 @@ key.user=Key user
 keyword.search=Keyword Search
 languages=Languages
 large=Large
+last.15.days=Last 15 days
 last.7.days=Last 7 days
 last.30.days=Last 30 days
 last.export.happened.with.old.storage.format.so.restored.data.might.not.be.correct.for.attachments.of.releases.in.subprojects=Last export happened with old storage format, so restored data might not be correct for attachments of releases in subprojects.
@@ -922,6 +923,7 @@ new.license=New License
 new.project=New Project
 new.releases=New releases
 next=next
+next.15.days=Next 15 days
 next.7.days=Next 7 days
 next.30.days=Next 30 days
 next.synchronization=Next Synchronization

diff --git a/...aries/datahandler/src/main/java/org/eclipse/sw360/datahandler/common/ThriftEnumUtils.java b/...aries/datahandler/src/main/java/org/eclipse/sw360/datahandler/common/ThriftEnumUtils.java
@@ -340,6 +340,7 @@ private ThriftEnumUtils() {
             .put(ClearingRequestState.IN_PROGRESS, "In Progress")
             .put(ClearingRequestState.CLOSED, "Closed")
             .put(ClearingRequestState.AWAITING_RESPONSE, "Awaiting Response")
+            .put(ClearingRequestState.ON_HOLD, "On Hold")
             .build();
 
     private static final ImmutableMap<ClearingReportStatus, String> MAP_CLEARING_REPORT_STATUS_STRING = ImmutableMap.<ClearingReportStatus, String>builder()

diff --git a/libraries/datahandler/src/main/thrift/sw360.thrift b/libraries/datahandler/src/main/thrift/sw360.thrift
@@ -72,6 +72,7 @@ enum ClearingRequestState {
     IN_PROGRESS = 4,
     CLOSED = 5,
     AWAITING_RESPONSE = 6
+    ON_HOLD = 7
 }
 
 enum ClearingRequestPriority {