SAK-49082: DateManager: Additional nullable date support, clear date …

…button, fixes for SAK-46023, SAK-46212, SAK-48788, SAK-48789
sakaiproject · Jul 7, 2023 · 7f3bb5c · 7f3bb5c
1 parent 3f7ead1
commit 7f3bb5c
Show file tree

Hide file tree

Showing 6 changed files with 298 additions and 84 deletions.
diff --git a/library/src/skins/default/src/sass/modules/tool/siteinfo/_siteinfo.scss b/library/src/skins/default/src/sass/modules/tool/siteinfo/_siteinfo.scss
@@ -76,6 +76,16 @@
 			margin-bottom: 0;
 			table-layout: fixed;
 
+			.field-required {
+				&:after {
+					content: "*";
+					color: var(--errorBanner-color);
+					position: relative;
+					top: 3px;
+					left: 3px;
+				}
+			}
+
 			td {
 				&.ajax-error {
 					background-color: var(--errorBanner-bgcolor);
@@ -94,6 +104,35 @@
 					border-bottom-right-radius: 0;
 				}
 
+				.hasDatepicker {
+					padding-right: 22%;
+					overflow: hidden;
+					text-overflow: ellipsis;
+				}
+
+				.ui-datepicker-trigger {
+					position: absolute;
+					top: 0;
+					right: 8px;
+				}
+
+				.ui-datepicker-clear-date {
+					position: relative;
+					top: 16%;
+					right: 22px;
+					cursor: text;
+					text-decoration: none;
+				}
+
+				.ui-datapicker-clear-date-icon {
+					cursor: pointer;
+				}
+
+				.ui-datepicker-clear-date > i[disabled] {
+					cursor: not-allowed;
+					color:#757575;
+				}
+
 				.day-of-week {
 					text-transform: capitalize;
 				}

diff --git a/...-manage/datemanager/api/src/java/org/sakaiproject/datemanager/api/DateManagerService.java b/...-manage/datemanager/api/src/java/org/sakaiproject/datemanager/api/DateManagerService.java
@@ -60,11 +60,13 @@ public interface DateManagerService {
 	public JSONArray getResourcesForContext(String siteId);
 	public DateManagerValidation validateResources(String siteId, JSONArray resources) throws Exception;
 	public void updateResources(DateManagerValidation resourceValidation) throws Exception;
+	public void clearUpdateResourceLocks(DateManagerValidation resourceValidation) throws Exception;
 
 	// Calendar methods
 	public JSONArray getCalendarEventsForContext(String siteId);
 	public DateManagerValidation validateCalendarEvents(String siteId, JSONArray calendarEvents) throws Exception;
 	public void updateCalendarEvents(DateManagerValidation calendarValidation) throws Exception;
+	public void clearUpdateCalendarLocks(DateManagerValidation calendarValidation) throws Exception;
 
 	// Forum methods
 	public JSONArray getForumsForContext(String siteId);
@@ -75,6 +77,7 @@ public interface DateManagerService {
 	public JSONArray getAnnouncementsForContext(String siteId);
 	public DateManagerValidation validateAnnouncements(String siteId, JSONArray announcements) throws Exception;
 	public void updateAnnouncements(DateManagerValidation announcementValidation) throws Exception;
+	public void clearUpdateAnnouncementLocks(DateManagerValidation announcementValidation) throws Exception;
 
 	// Lessons methods
 	public JSONArray getLessonsForContext(String siteId);