Skip to content

Add description field to Enrollment Flows (CFM-435) #260

Closed
Changes from 1 commit
Commits
Show all changes
76 commits
Select commit Hold shift + click to select a range
9fec427
Initial implementation of Enrollment Flow infrastructure and Attribut…
Feb 27, 2024
a1ea421
Miscellaneous Enrollment fixes (CFM-31)
Feb 28, 2024
e3332e5
Refactor EnrollmentFlow* files:setPermissions
Ioannis Mar 3, 2024
2557d43
Add top-level subnavigation to Enrollment Flow and Enrollment Flow St…
arlen Mar 7, 2024
fe55799
Add main-menu navigation for Petitions and Enrollments (CFM-31)
arlen Mar 8, 2024
b56f338
Add titles to Petition steps and buttons to the steps index (CFM-31) …
arlen Mar 13, 2024
4549f2e
Simplify end-user Petition views (CFM-31) (#175)
arlen Mar 13, 2024
7e469d5
Subnavigation fix for Enrollment Flow steps (CFM-31) (#177)
arlen Mar 27, 2024
e92b586
Post-rebase vs. develop corrections (CFM-31)
arlen Aug 14, 2024
0101b94
Update AttributeCollectors permissions definition (CFM-31)
Sep 22, 2024
c8fc075
fix EnrollmetFlow and EnrollmentFlowSteps fields
Ioannis Sep 23, 2024
42ee120
Fix EnrollmentAttributes fiels
Ioannis Sep 24, 2024
23bac8d
lookupPersonByLogin vs lookupPersonForLogin fix
Ioannis Sep 24, 2024
63c5968
Render Enrollment Attributes edit/add/view in a modal
Ioannis Sep 24, 2024
8788021
remove duplicate field
Ioannis Sep 24, 2024
bae9488
Correct test for $rowActions post-rebase. (CFM-31)
arlen Sep 24, 2024
9a427e2
feature-cfm31-subnavigation (#217)
Ioannis Sep 26, 2024
7be2d7d
Fix EnrollmentFlow broken start view. Fix petitions view.
Ioannis Sep 27, 2024
bb01666
Fix dispatch View to use the new FieldHelper.php
Ioannis Sep 27, 2024
1c97ecb
Fix missing curly brach error
Ioannis Sep 27, 2024
8fcfc71
Improve Form global edit mode handling
Ioannis Sep 27, 2024
7c54415
Fix petition view issue
Ioannis Sep 27, 2024
b97ba33
Add filter block for Enrollment Flows and Petitions
Ioannis Sep 27, 2024
65f370d
Filter Petitions by COU
Ioannis Sep 27, 2024
0e4f691
Make dispatch view editable
Ioannis Sep 27, 2024
2774525
Add petition "start" action to $isActivePetition boolean in default.p…
arlen Sep 27, 2024
651eccc
Add enrollment attribute view should redirect to "self" (CFM-31) (#219)
arlen Sep 27, 2024
1587699
Remove deprecated subnavigation config (CFM-31) (#220)
arlen Sep 27, 2024
20ba5da
fix iframe flash message rendering
Ioannis Sep 27, 2024
27fc36e
Simple fix for h1 title (CFM-31) (#221)
arlen Sep 27, 2024
bfe37bd
Ensure a title exists on Petition start, dispatch, and resume (CFM-31…
arlen Sep 27, 2024
4289852
Remove unnecessary top-link from Enrollment Flow properties (CFM-31) …
arlen Sep 27, 2024
13b9e1c
fix deep nested navigation tab id calculation
Ioannis Sep 28, 2024
6ab65c2
Add TabHelper missing dependency
Ioannis Sep 29, 2024
b9f19e9
Refactor Enrollment Attributes Add/Edit view (#224)
Ioannis Sep 30, 2024
b8c14db
Fix wrong url id harvest (#225)
Ioannis Sep 30, 2024
5e8df10
Set petition titles (Enrollment Flow name, Flow Step description) in …
arlen Sep 30, 2024
f064512
fix subnavigation issues (#228)
Ioannis Oct 1, 2024
d206890
Cleanup to subnavigation and titling (CFM-31) (#229)
arlen Oct 2, 2024
80b200f
Initial implementation of BasicAttributeCollector (CFM-415) (#231)
benno Oct 3, 2024
d6cb69b
Subnavigation fixes (#230)
Ioannis Oct 3, 2024
7e73653
Fix field config for select elements in Pipelines and Message Templat…
arlen Oct 10, 2024
f4c5359
fix FieldHelper.php fieldType missing fieldSelectOptions issue
Ioannis Oct 14, 2024
69e710c
Fix tab rendering for EnrollmentFlow plugins (#235)
Ioannis Oct 14, 2024
5c52be2
Conditionally include a 'Cancel' button next to 'Save' (CFM-31) (#236)
arlen Oct 14, 2024
1008163
Fix use case:Plugin.Hierarchy deep nested when no hasMany association.
Ioannis Oct 15, 2024
59e1267
Merge pull request #237 from Ioannis/fix_deep_nested_association_calc…
Ioannis Oct 15, 2024
d592cf4
Check for hasMany associations before rendering a tab
Ioannis Oct 16, 2024
23ec40a
Merge pull request #238 from Ioannis/Fix_missing_associations_tablist
Ioannis Oct 16, 2024
e24ecc7
Fix misspelled variable
Ioannis Oct 21, 2024
fd0e917
Fix Petition Attributes Form rendering (#241)
Ioannis Oct 23, 2024
039d678
Initial theme commit for Enrollment Flow Attribute Collector (CFM-31)…
arlen Oct 23, 2024
7378151
Update of attribute collector list-element class names for better con…
arlen Oct 23, 2024
77ccfbb
Fix Attribute Collectors dispatch view dependency data
Ioannis Oct 24, 2024
4ca3036
Select attribute fields by css class name (CFM-31) (#245)
arlen Oct 24, 2024
444fede
Initial commit of Mostly Static Pages (CFM-62), InvitationAccepter (C…
Oct 31, 2024
68db3dd
Initial implementation of Identifier Collector Enroller (CFM-111)
Nov 3, 2024
641d73d
Update attribute collector CSS selectors to reflect updated DOM class…
arlen Nov 6, 2024
7d8135a
First pass at cleaning up Petition view (CFM-31) (#246)
arlen Nov 8, 2024
6a90028
Add support for attribute collection fieldsets (#244)
Ioannis Nov 13, 2024
701b8d1
Switch to Material Symbols (CFM-404) (#248)
arlen Nov 13, 2024
5ce3f4a
Style Basic Attribute Collector and ensure that names and telephone n…
arlen Nov 15, 2024
b444d89
Fix flash error construction.name type_id field is required
Ioannis Nov 15, 2024
7474127
method parameters must not come before the required ones as of php 8.1
Ioannis Nov 15, 2024
89bb59d
cfm-31_people-picker (#250)
Ioannis Nov 18, 2024
814d1e1
Add special "Start" button to Enrollment Flow views (CFM-428) (#251)
arlen Nov 21, 2024
71d494b
Small stylistic improvements to Enrollment Flow dispatch and start vi…
arlen Nov 21, 2024
b68282f
Improve Petition index and add a label prefix config for index view (…
arlen Nov 21, 2024
cce29b6
Allow null coid for AutoViewVarsTrait (nojira)
arlen Nov 22, 2024
6c2e6a4
Merge pull request #254 from arlen/nojira-allowNullCoIDAutoViewVars
Ioannis Nov 23, 2024
11cd46c
Make Add drop-down menu a panel. Also fix welcome message and main me…
arlen Nov 27, 2024
045abe1
Initial commit of Email Verifier Enroller Plugin (CFM-333)
Nov 28, 2024
4787fbd
Additional commit for CFM-333
Nov 28, 2024
b72575f
Implement finalization tasks (CFM-31)
Nov 28, 2024
748adb3
Provide better evaluations in upperButtons start enrollment flow link…
arlen Dec 4, 2024
46c1634
Add description field to Enrollment Flows (CFM-435)
arlen Dec 6, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Prev Previous commit
Next Next commit
Simplify end-user Petition views (CFM-31) (#175)
  • Loading branch information
arlen committed Sep 24, 2024
commit 4549f2e3aecaa931578c9ab85ddaed056d4a64eb
3 changes: 3 additions & 0 deletions app/resources/locales/en_US/menu.po
@@ -192,6 +192,9 @@ msgstr "medium"
msgid "menu.density.large"
msgstr "large"

msgid "menu.home"
msgstr "Home"

msgid "menu.introduction"
msgstr "Please select an action from the menu."

31 changes: 31 additions & 0 deletions app/templates/EnrollmentFlowSteps/fields-nav.inc
@@ -0,0 +1,31 @@
<?php
/**
* COmanage Registry Enrollment Flow Steps Nav
*
* Portions licensed to the University Corporation for Advanced Internet
* Development, Inc. ("UCAID") under one or more contributor license agreements.
* See the NOTICE file distributed with this work for additional information
* regarding copyright ownership.
*
* UCAID licenses this file to you under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with the
* License. You may obtain a copy of the License at:
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
* @link https://www.internet2.edu/comanage COmanage Project
* @package registry
* @since COmanage Registry v5.0.0
* @license Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
*/

$subnav = [
'name' => 'enrollment_flow',
'active' => 'steps'
];
33 changes: 33 additions & 0 deletions app/templates/Petitions/resume.php
@@ -29,12 +29,45 @@

// Track when we've rendered the current/next step so we know when to stop rendering links
$seenNextStep = false;

$action_args = [];
if(!empty($vv_cur_co) && $vv_user_roles['authuser']) {
if($vv_user_roles['co'] || $vv_user_roles['platform']) {
$action_args['vv_actions'][] = [
'order' => $this->Menu->getMenuOrder('Default'),
'icon' => 'pending_actions',
'url' => [
'plugin' => null,
'controller' => 'Petitions',
'action' => 'index',
'?' => ['co_id' => $vv_cur_co->id]
],
'label' => __d('controller', 'Petitions', 99)
];
}
$action_args['vv_actions'][] = [
'order' => $this->Menu->getMenuOrder('Default'),
'icon' => 'home',
'url' => [
'plugin' => null,
'controller' => 'Dashboards',
'action' => 'dashboard',
'?' => ['co_id' => $vv_cur_co->id]
],
'label' => __d('menu', 'menu.home')
];
}
?>

<div class="page-title-container">
<div class="page-title">
<h1><?= $vv_primary_link_obj->name; // this is the Enrollment Flow name ?></h1>
</div>
<?php if(!empty($action_args)): ?>
<div class="field-actions top-links">
<?= $this->element('menuAction', $action_args) ?>
</div>
<?php endif; ?>
</div>

<!-- Flash Messages and defined Info Banners -->
4 changes: 0 additions & 4 deletions app/templates/Standard/add-edit-view.php
@@ -49,10 +49,6 @@
}
}

if(file_exists($templatePath . DS . "fields-links.inc")) {
include($templatePath . DS . "fields-links.inc");
}

// $linkFilter is used for models that belong to a specific parent model (eg: co_id)
$linkFilter = [];

16 changes: 15 additions & 1 deletion app/templates/Standard/dispatch.php
@@ -35,12 +35,26 @@
// $vv_template_path will be set for plugins
$templatePath = $vv_template_path ?? ROOT . DS . "templates" . DS . $modelsName;

$action_args['vv_actions'][] = [
'order' => $this->Menu->getMenuOrder('Default'),
'icon' => 'list',
'url' => [
'plugin' => null,
'controller' => 'petitions',
'action' => 'resume',
$vv_petition->id
],
'label' => __d('controller', 'EnrollmentFlowSteps', 99)
];
?>

<div class="page-title-container">
<div class="page-title">
<h1><?= $vv_title; ?></h1>
</div>
<div class="field-actions top-links">
<?= $this->element('menuAction', $action_args) ?>
</div>
</div>

<!-- Flash Messages and defined Info Banners -->
@@ -87,7 +101,7 @@
include($templatePath . DS . "dispatch.inc");
}

print $this->Field->submit(__d('operation', 'save'));
print $this->Field->submit(__d('operation', 'continue'));

print $this->Form->end();

31 changes: 18 additions & 13 deletions app/templates/layout/default.php
@@ -90,6 +90,7 @@
$bodyClasses = $controller_stripped . ' ' .$action_stripped;
$isCoSelectView = $controller_stripped == 'cos' && $action_stripped == 'select';
$isDashboard = $controller_stripped == 'dashboards' && $action_stripped == 'dashboard';
$isActivePetition = $vv_action == 'dispatch' || $vv_action == 'resume';
$generateHomeLink = (!$isCoSelectView && !empty($vv_cur_co));

// add further body classes as needed
@@ -166,17 +167,19 @@
<?php endif ?>
</header>

<div id="top-bar">
<?php if(!empty($vv_user) && !empty($vv_cur_co) && !$isCoSelectView): ?>
<div id="top-controls">
<div id="co-hamburger"><em class="material-icons">menu</em></div>
<?= $this->element('searchGlobal') ?>
<?php if(!$isActivePetition): ?>
<div id="top-bar">
<?php if(!empty($vv_user) && !empty($vv_cur_co) && !$isCoSelectView): ?>
<div id="top-controls">
<div id="co-hamburger"><em class="material-icons">menu</em></div>
<?= $this->element('searchGlobal') ?>
</div>
<?php endif; // vv_user ?>
<div id="top-menu">
<?= $this->element('menuTop') ?>
</div>
<?php endif; // vv_user ?>
<div id="top-menu">
<?= $this->element('menuTop') ?>
</div>
</div>
<?php endif; ?>

<?php if($isPlatformCO): ?>
<?php
@@ -194,16 +197,18 @@
<?php endif; ?>

<div id="main-wrapper">
<?php if(!empty($vv_user) && !empty($vv_cur_co) && !$isCoSelectView): ?>
<?php if(!empty($vv_user) && !empty($vv_cur_co) && !$isCoSelectView &&!$isActivePetition): ?>
<?= $this->element('menuMain') ?>
<?php endif ?>

<main id="main">
<div id="content">
<div id="content-inner">
<div id="breadcrumbs">
<?= $this->element('breadcrumbs') ?>
</div>
<?php if(!$isActivePetition): ?>
<div id="breadcrumbs">
<?= $this->element('breadcrumbs') ?>
</div>
<?php endif; ?>

<!-- insert the anchor that is the target of accessible "skip to content" link -->
<a id="content-start"></a>