Merge pull request #58 from CCPBioSim/views

jimboid · web-flow · commit f04903a44fde · 2026-02-13T16:59:49.000Z
implement changes to improve the events view
diff --git a/com_ccpbiosim/administrator/forms/event.xml b/com_ccpbiosim/administrator/forms/event.xml
@@ -14,15 +14,15 @@
     <field name="created_by" type="createdby" default="0" label="JGLOBAL_FIELD_CREATED_BY_LABEL" description="JGLOBAL_FIELD_CREATED_BY_DESC" hidden="true" hint="COM_CCPBIOSIM_FORM_LBL_EVENT_CREATED_BY"/>
     <field name="modified_by" type="modifiedby" default="0" label="JGLOBAL_FIELD_MODIFIED_BY_LABEL" description="JGLOBAL_FIELD_MODIFIED_BY_DESC" hidden="true" hint="COM_CCPBIOSIM_FORM_LBL_EVENT_MODIFIED_BY"/>
     <field name="title" filter="safehtml" type="text" required="true" label="JGLOBAL_TITLE" description="COM_CCPBIOSIM_FORM_DESC_EVENT_TITLE" hint="Add a title for this event"/>
+    <field name="shorturl" filter="safehtml" type="text" required="true" label="COM_CCPBIOSIM_FORM_LBL_EVENT_SHORTURL" description="COM_CCPBIOSIM_FORM_DESC_EVENT_SHORTURL" hint="COM_CCPBIOSIM_FORM_LBL_EVENT_SHORTURL"/>
     <field name="category" query="SELECT * FROM #__ccpbiosim_event_categories" key_field="id" value_field="eventcategory" header="Event Category" type="sql" layout="joomla.form.field.list-fancy-select" required="true" label="COM_CCPBIOSIM_FORM_LBL_EVENT_CATEGORY" description="COM_CCPBIOSIM_FORM_DESC_EVENT_CATEGORY" hint="COM_CCPBIOSIM_FORM_LBL_EVENT_CATEGORY"/>
+    <field name="location" default="Manchester, UK" filter="safehtml" type="text" required="true" label="COM_CCPBIOSIM_FORM_LBL_EVENT_LOCATION" description="COM_CCPBIOSIM_FORM_DESC_EVENT_LOCATION" hint="COM_CCPBIOSIM_FORM_LBL_EVENT_LOCATION"/>
     <field name="startdatetime" type="calendar" class="inputbox" format="%Y-%m-%d %H:%M:%S" showtime="true" translateformat="true" required="true" label="COM_CCPBIOSIM_FORM_LBL_EVENT_STARTDATETIME" description="COM_CCPBIOSIM_FORM_DESC_EVENT_STARTDATETIME" hint="COM_CCPBIOSIM_FORM_LBL_EVENT_STARTDATETIME"/>
     <field name="enddatetime" type="calendar" class="inputbox" format="%Y-%m-%d %H:%M:%S" showtime="true" translateformat="true" required="true" label="COM_CCPBIOSIM_FORM_LBL_EVENT_ENDDATETIME" description="COM_CCPBIOSIM_FORM_DESC_EVENT_ENDDATETIME" hint="COM_CCPBIOSIM_FORM_LBL_EVENT_ENDDATETIME"/>
-    <field name="eventdetails" editor="|" buttons="true" filter="\Joomla\CMS\Component\ComponentHelper::filterText" type="editor" required="true" label="COM_CCPBIOSIM_FORM_LBL_EVENT_EVENTDETAILS" description="COM_CCPBIOSIM_FORM_DESC_EVENT_EVENTDETAILS" hint="COM_CCPBIOSIM_FORM_LBL_EVENT_EVENTDETAILS"/>
-    <field name="location" default="Manchester, UK" filter="safehtml" type="text" required="true" label="COM_CCPBIOSIM_FORM_LBL_EVENT_LOCATION" description="COM_CCPBIOSIM_FORM_DESC_EVENT_LOCATION" hint="COM_CCPBIOSIM_FORM_LBL_EVENT_LOCATION"/>
     <field name="shortdesc" maxlength="100" filter="safehtml" type="text" required="true" label="COM_CCPBIOSIM_FORM_LBL_EVENT_SHORTDESC" description="COM_CCPBIOSIM_FORM_DESC_EVENT_SHORTDESC" hint="COM_CCPBIOSIM_FORM_LBL_EVENT_SHORTDESC"/>
+    <field name="eventdetails" editor="|" buttons="true" filter="\Joomla\CMS\Component\ComponentHelper::filterText" type="editor" required="true" label="COM_CCPBIOSIM_FORM_LBL_EVENT_EVENTDETAILS" description="COM_CCPBIOSIM_FORM_DESC_EVENT_EVENTDETAILS" hint="COM_CCPBIOSIM_FORM_LBL_EVENT_EVENTDETAILS"/>
     <field name="youtube" validate="url" type="url" label="COM_CCPBIOSIM_FORM_LBL_EVENT_YOUTUBE" description="COM_CCPBIOSIM_FORM_DESC_EVENT_YOUTUBE" hint="COM_CCPBIOSIM_FORM_LBL_EVENT_YOUTUBE"/>
     <field name="postevent" editor="|" buttons="true" filter="\Joomla\CMS\Component\ComponentHelper::filterText" type="editor" label="COM_CCPBIOSIM_FORM_LBL_EVENT_POSTEVENT" description="COM_CCPBIOSIM_FORM_DESC_EVENT_POSTEVENT" hint="COM_CCPBIOSIM_FORM_LBL_EVENT_POSTEVENT"/>
-    <field name="shorturl" filter="safehtml" type="text" required="true" label="COM_CCPBIOSIM_FORM_LBL_EVENT_SHORTURL" description="COM_CCPBIOSIM_FORM_DESC_EVENT_SHORTURL" hint="COM_CCPBIOSIM_FORM_LBL_EVENT_SHORTURL"/>
     <field name="version_note" type="text" label="JGLOBAL_FIELD_VERSION_NOTE_LABEL" description="JGLOBAL_FIELD_VERSION_NOTE_DESC" class="inputbox" size="45" labelclass="control-label"/>
   </fieldset>
 </form>
diff --git a/com_ccpbiosim/administrator/tmpl/event/edit.php b/com_ccpbiosim/administrator/tmpl/event/edit.php
@@ -24,23 +24,22 @@
 	action="<?php echo Route::_('index.php?option=com_ccpbiosim&layout=edit&id=' . (int) $this->item->id); ?>"
 	method="post" enctype="multipart/form-data" name="adminForm" id="event-form" class="form-validate form-horizontal">
 
-	
 	<?php echo HTMLHelper::_('uitab.startTabSet', 'myTab', array('active' => 'event')); ?>
 	<?php echo HTMLHelper::_('uitab.addTab', 'myTab', 'event', Text::_('COM_CCPBIOSIM_TAB_EVENT', true)); ?>
 	<div class="row-fluid">
 		<div class="col-md-12 form-horizontal">
 			<fieldset class="adminform">
 				<legend><?php echo Text::_('COM_CCPBIOSIM_FIELDSET_EVENT'); ?></legend>
 				<?php echo $this->form->renderField('title'); ?>
+				<?php echo $this->form->renderField('shorturl'); ?>
 				<?php echo $this->form->renderField('category'); ?>
+				<?php echo $this->form->renderField('location'); ?>
 				<?php echo $this->form->renderField('startdatetime'); ?>
 				<?php echo $this->form->renderField('enddatetime'); ?>
-				<?php echo $this->form->renderField('eventdetails'); ?>
-				<?php echo $this->form->renderField('location'); ?>
 				<?php echo $this->form->renderField('shortdesc'); ?>
+				<?php echo $this->form->renderField('eventdetails'); ?>
 				<?php echo $this->form->renderField('youtube'); ?>
 				<?php echo $this->form->renderField('postevent'); ?>
-				<?php echo $this->form->renderField('shorturl'); ?>
 				<?php if ($this->state->params->get('save_history', 1)) : ?>
 					<div class="control-group">
 						<div class="control-label"><?php echo $this->form->getLabel('version_note'); ?></div>
@@ -58,7 +57,6 @@
 	<?php echo $this->form->renderField('created_by'); ?>
 	<?php echo $this->form->renderField('modified_by'); ?>
 
-	
 	<?php echo HTMLHelper::_('uitab.endTabSet'); ?>
 
 	<input type="hidden" name="task" value=""/>
diff --git a/com_ccpbiosim/media/css/site.css b/com_ccpbiosim/media/css/site.css
@@ -182,7 +182,7 @@
 }
 
 .events-date .year {
-  font-size: 0.7rem;
+  font-size: 0.75rem;
   opacity: 0.8;
 }
 
diff --git a/com_ccpbiosim/site/forms/eventform.xml b/com_ccpbiosim/site/forms/eventform.xml
@@ -12,15 +12,15 @@
     <field name="checked_out" type="hidden" filter="unset"/>
     <field name="checked_out_time" type="hidden" filter="unset"/>
     <field name="title" filter="safehtml" type="text" required="true" label="JGLOBAL_TITLE" description="COM_CCPBIOSIM_FORM_DESC_EVENT_TITLE" hint="Add a title for this event"/>
+    <field name="shorturl" filter="safehtml" type="text" required="true" label="COM_CCPBIOSIM_FORM_LBL_EVENT_SHORTURL" description="COM_CCPBIOSIM_FORM_DESC_EVENT_SHORTURL" hint="COM_CCPBIOSIM_FORM_LBL_EVENT_SHORTURL"/>
     <field name="category" query="SELECT * FROM #__ccpbiosim_event_categories" key_field="id" value_field="eventcategory" header="Event Category" type="sql" layout="joomla.form.field.list-fancy-select" required="true" label="COM_CCPBIOSIM_FORM_LBL_EVENT_CATEGORY" description="COM_CCPBIOSIM_FORM_DESC_EVENT_CATEGORY" hint="COM_CCPBIOSIM_FORM_LBL_EVENT_CATEGORY"/>
+    <field name="location" default="Manchester, UK" filter="safehtml" type="text" required="true" label="COM_CCPBIOSIM_FORM_LBL_EVENT_LOCATION" description="COM_CCPBIOSIM_FORM_DESC_EVENT_LOCATION" hint="COM_CCPBIOSIM_FORM_LBL_EVENT_LOCATION"/>
     <field name="startdatetime" type="calendar" class="inputbox" format="%Y-%m-%d %H:%M:%S" showtime="true" translateformat="true" required="true" label="COM_CCPBIOSIM_FORM_LBL_EVENT_STARTDATETIME" description="COM_CCPBIOSIM_FORM_DESC_EVENT_STARTDATETIME" hint="COM_CCPBIOSIM_FORM_LBL_EVENT_STARTDATETIME"/>
     <field name="enddatetime" type="calendar" class="inputbox" format="%Y-%m-%d %H:%M:%S" showtime="true" translateformat="true" required="true" label="COM_CCPBIOSIM_FORM_LBL_EVENT_ENDDATETIME" description="COM_CCPBIOSIM_FORM_DESC_EVENT_ENDDATETIME" hint="COM_CCPBIOSIM_FORM_LBL_EVENT_ENDDATETIME"/>
-    <field name="eventdetails" editor="|" buttons="true" filter="\Joomla\CMS\Component\ComponentHelper::filterText" type="editor" required="true" label="COM_CCPBIOSIM_FORM_LBL_EVENT_EVENTDETAILS" description="COM_CCPBIOSIM_FORM_DESC_EVENT_EVENTDETAILS" hint="COM_CCPBIOSIM_FORM_LBL_EVENT_EVENTDETAILS"/>
-    <field name="location" default="Manchester, UK" filter="safehtml" type="text" required="true" label="COM_CCPBIOSIM_FORM_LBL_EVENT_LOCATION" description="COM_CCPBIOSIM_FORM_DESC_EVENT_LOCATION" hint="COM_CCPBIOSIM_FORM_LBL_EVENT_LOCATION"/>
     <field name="shortdesc" maxlength="100" filter="safehtml" type="text" required="true" label="COM_CCPBIOSIM_FORM_LBL_EVENT_SHORTDESC" description="COM_CCPBIOSIM_FORM_DESC_EVENT_SHORTDESC" hint="COM_CCPBIOSIM_FORM_LBL_EVENT_SHORTDESC"/>
+    <field name="eventdetails" editor="|" buttons="true" filter="\Joomla\CMS\Component\ComponentHelper::filterText" type="editor" required="true" label="COM_CCPBIOSIM_FORM_LBL_EVENT_EVENTDETAILS" description="COM_CCPBIOSIM_FORM_DESC_EVENT_EVENTDETAILS" hint="COM_CCPBIOSIM_FORM_LBL_EVENT_EVENTDETAILS"/>
     <field name="youtube" validate="url" type="url" label="COM_CCPBIOSIM_FORM_LBL_EVENT_YOUTUBE" description="COM_CCPBIOSIM_FORM_DESC_EVENT_YOUTUBE" hint="COM_CCPBIOSIM_FORM_LBL_EVENT_YOUTUBE"/>
     <field name="postevent" editor="|" buttons="true" filter="\Joomla\CMS\Component\ComponentHelper::filterText" type="editor" label="COM_CCPBIOSIM_FORM_LBL_EVENT_POSTEVENT" description="COM_CCPBIOSIM_FORM_DESC_EVENT_POSTEVENT" hint="COM_CCPBIOSIM_FORM_LBL_EVENT_POSTEVENT"/>
-    <field name="shorturl" filter="safehtml" type="text" required="true" label="COM_CCPBIOSIM_FORM_LBL_EVENT_SHORTURL" description="COM_CCPBIOSIM_FORM_DESC_EVENT_SHORTURL" hint="COM_CCPBIOSIM_FORM_LBL_EVENT_SHORTURL"/>
     <field name="version_note" type="text" label="JGLOBAL_FIELD_VERSION_NOTE_LABEL" description="JGLOBAL_FIELD_VERSION_NOTE_DESC" class="inputbox" size="45" labelclass="control-label"/>
   </fieldset>
 </form>
diff --git a/com_ccpbiosim/site/tmpl/events/upcoming-accordion.php b/com_ccpbiosim/site/tmpl/events/upcoming-accordion.php
@@ -42,7 +42,12 @@
     </div>
 <?php endif;?>
 <p>Below are upcoming events relevant to our community.</p>
-
+<?php if ($canCreate) : ?>
+  <a href="<?php echo Route::_('index.php?option=com_ccpbiosim&task=eventform.edit&id=0', false, 0); ?>"
+     class="btn btn-success btn-small"><i
+     class="icon-plus"></i>
+     <?php echo Text::_('COM_CCPBIOSIM_ADD_ITEM'); ?></a>
+<?php endif; ?>
 <!-- Main Content -->
 <div class="container my-5">
   <div class="accordion" id="eventsAccordion">
@@ -61,9 +66,15 @@
                 <a href="<?php echo Route::_('index.php?option=com_ccpbiosim&view=event&id='.(int) $item->id); ?>"
                    class="list-group-item list-group-item-action d-flex align-items-start gap-3">
                   <div class="events-date bg-success text-white">
-                    <div class="month">Apr</div>
-                    <div class="day">2</div>
-                    <div class="year">2026</div>
+                    <div class="month"><?php echo Factory::getDate($item->startdatetime)->format("M"); ?></div>
+                    <div class="day">
+                      <?php if (Factory::getDate($item->startdatetime)->__get("day") == Factory::getDate($item->enddatetime)->__get("day")): ?>
+                        <?php echo Factory::getDate($item->startdatetime)->__get("day"); ?>
+                      <?php else: ?>
+                        <?php echo Factory::getDate($item->startdatetime)->__get("day"); ?>-<?php echo Factory::getDate($item->enddatetime)->__get("day"); ?>
+                      <?php endif; ?>
+                    </div>
+                    <div class="year"><?php echo Factory::getDate($item->startdatetime)->__get("year"); ?></div>
                   </div>
                   <div>
                     <h6 class="mb-1"><?php echo $this->escape($item->title); ?></h6>
@@ -92,9 +103,15 @@ class="list-group-item list-group-item-action d-flex align-items-start gap-3">
                 <a href="<?php echo Route::_('index.php?option=com_ccpbiosim&view=event&id='.(int) $item->id); ?>"
                    class="list-group-item list-group-item-action d-flex align-items-start gap-3">
                   <div class="events-date bg-primary text-white">
-                    <div class="month">Apr</div>
-                    <div class="day">2</div>
-                    <div class="year">2026</div>
+                    <div class="month"><?php echo Factory::getDate($item->startdatetime)->format("M"); ?></div>
+                    <div class="day">
+                      <?php if (Factory::getDate($item->startdatetime)->__get("day") == Factory::getDate($item->enddatetime)->__get("day")): ?>
+                        <?php echo Factory::getDate($item->startdatetime)->__get("day"); ?>
+                      <?php else: ?>
+                        <?php echo Factory::getDate($item->startdatetime)->__get("day"); ?>-<?php echo Factory::getDate($item->enddatetime)->__get("day"); ?>
+                      <?php endif; ?>
+                    </div>
+                    <div class="year"><?php echo Factory::getDate($item->startdatetime)->__get("year"); ?></div>
                   </div>
                   <div>
                     <h6 class="mb-1"><?php echo $this->escape($item->title); ?></h6>
@@ -123,9 +140,15 @@ class="list-group-item list-group-item-action d-flex align-items-start gap-3">
                 <a href="<?php echo Route::_('index.php?option=com_ccpbiosim&view=event&id='.(int) $item->id); ?>"
                    class="list-group-item list-group-item-action d-flex align-items-start gap-3">
                   <div class="events-date bg-warning text-white">
-                    <div class="month">Apr</div>
-                    <div class="day">2</div>
-                    <div class="year">2026</div>
+                    <div class="month"><?php echo Factory::getDate($item->startdatetime)->format("M"); ?></div>
+                    <div class="day">
+                      <?php if (Factory::getDate($item->startdatetime)->__get("day") == Factory::getDate($item->enddatetime)->__get("day")): ?>
+                        <?php echo Factory::getDate($item->startdatetime)->__get("day"); ?>
+                      <?php else: ?>
+                        <?php echo Factory::getDate($item->startdatetime)->__get("day"); ?>-<?php echo Factory::getDate($item->enddatetime)->__get("day"); ?>
+                      <?php endif; ?>
+                    </div>
+                    <div class="year"><?php echo Factory::getDate($item->startdatetime)->__get("year"); ?></div>
                   </div>
                   <div>
                     <h6 class="mb-1"><?php echo $this->escape($item->title); ?></h6>

Original file line number	Diff line number	Diff line change
`@@ -182,7 +182,7 @@`
`182`	`182`	`}`
`183`	`183`
`184`	`184`	`.events-date .year {`
`185`		`- font-size: 0.7rem;`
	`185`	`+ font-size: 0.75rem;`
`186`	`186`	`opacity: 0.8;`
`187`	`187`	`}`
`188`	`188`