Skip to content

Commit

Permalink
Improve EnvSource petition display and make Attribute Collector displ…
Browse files Browse the repository at this point in the history 
…ays consistent (CFM-116) (#306)

* Improve EnvSource petition display and make Attribute Collector displays consistent (CFM-116)

* Improve EnvSource dispatch display (CFM-116)

* Sort the attributes within EnvSource dispatch display (CFM-116)
  • Loading branch information
@arlen
arlen authored Mar 1, 2025
1 parent e2d6784 commit 53236fd
Show file tree
Hide file tree
Showing 6 changed files with 112 additions and 34 deletions.
5 changes: 2 additions & 3 deletions app/plugins/CoreEnroller/templates/cell/AttributeCollectors/display.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,9 @@
['controller' => \App\Lib\Util\StringUtilities::foreignKeyToController($attribute->attribute), 'action' => 'edit', $attr->value]);
}
?>
<li class="petition-attr-<?= $this->Petition->getClassPostfixFromAttributeName($attribute->attribute) ?>">
<li class="petition-key-value petition-attr-<?= $this->Petition->getClassPostfixFromAttributeName($attribute->attribute) ?>">
<h4 class="petition-attr-label"><?= $attribute->label ?></h4>
<div class="petition-attr-value"><?= $value ?>
</div>
<div class="petition-attr-value"><?= $value ?></div>
</li>
<?php else: ?>
<li class="petition-attr-<?= $this->Petition->getClassPostfixFromAttributeName($attribute->attribute) ?>">
Expand Down
2 changes: 1 addition & 1 deletion app/plugins/CoreEnroller/templates/cell/BasicAttributeCollectors/display.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
</li>
</ul>
</li>
<li class="petition-attr-email">
<li class="petition-key-value petition-attr-email">
<h4 class="petition-attr-label">Email Address</h4>
<div class="petition-attr-value"><?= $vv_petition_basic_attribute_set['mail'] ?? "" ?></div>
</li>
Expand Down
35 changes: 24 additions & 11 deletions app/plugins/EnvSource/templates/EnvSourceCollectors/dispatch.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,16 +31,29 @@ declare(strict_types = 1);
if($vv_action == 'dispatch') {
// Make the Form fields editable
$this->Field->enableFormEditMode();

ksort($vv_env_source_vars);
$previousKey = '';
// Render the parsed variables

print "<p>" . __d('env_source', 'information.review') . "</p>";

print "<ul>";

foreach($vv_env_source_vars as $k => $v) {
print "<li>" . __d('env_source', 'field.EnvSources.'.$k) . ": " . $v . "</li>\n";
}

print "</ul>";
?>
<p><?= __d('env_source', 'information.review') ?> </p>
<ul>
<?php foreach($vv_env_source_vars as $k => $v): ?>
<?php
$liClass = 'petition-key-value';
if(substr($previousKey,0,7) != substr($k, 0, 7)) {
$liClass .= ' env-source-key-value-newgroup';
}
?>
<li class="<?= $liClass ?>">
<div class="env-source-key">
<?= __d('env_source', 'field.EnvSources.'.$k) ?>
</div>
<div class="env-source-value">
<?= $v ?>
</div>
</li>
<?php $previousKey = $k ?>
<?php endforeach; ?>
</ul>
<?php
}
46 changes: 39 additions & 7 deletions app/plugins/EnvSource/templates/cell/EnvSourceCollectors/display.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,46 @@
return;
}

$env_attributes = json_decode($vv_petition_env_identities->env_source_identity->env_attributes);

$env_attributes = json_decode($vv_petition_env_identities->env_source_identity->env_attributes, true);
ksort($env_attributes);
$previousKey = '';
?>

<ul>
<li>Env Source Identity ID: <?= $vv_petition_env_identities->env_source_identity->id ?></li>
<li>Source Key: <?= $vv_petition_env_identities->env_source_identity->source_key ?></li>
<?php foreach($env_attributes as $k => $v): ?>
<li><?= __d('env_source', 'field.EnvSources.'.$k) . ": " . $v ?></li>
<ul class="env-source-attrs">
<li class="petition-key-value env-source-key-value-newgroup">
<div class="env-source-key">
Env Source Identity ID:
</div>
<div class="env-source-value">
<?= $vv_petition_env_identities->env_source_identity->id ?>
</div>
</li>
<li class="petition-key-value">
<div class="env-source-key">
Source Key:
</div>
<div class="env-source-value">
<?= $vv_petition_env_identities->env_source_identity->source_key ?>
</div>
</li>

<?php
foreach($env_attributes as $k => $v):
?>
<?php
$liClass = 'petition-key-value';
if(substr($previousKey,0,7) != substr($k, 0, 7)) {
$liClass .= ' env-source-key-value-newgroup';
}
?>
<li class="<?= $liClass ?>">
<div class="env-source-key">
<?= __d('env_source', 'field.EnvSources.'.$k) ?>
</div>
<div class="env-source-value">
<?= $v ?>
</div>
</li>
<?php $previousKey = $k ?>
<?php endforeach ?>
</ul>
42 changes: 36 additions & 6 deletions app/webroot/css/co-base.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1704,7 +1704,7 @@ table.duet-date__table tr th:first-child,
table.duet-date__table tr td:first-child,
table.duet-date__table th,
table.duet-date__table td {
padding: unset;
padding: unset !important;
}
table.duet-date__table th.duet-date__table-header {
padding: 8px;
Expand Down Expand Up @@ -1964,9 +1964,18 @@ body.start .submit {
#dispatch-list-container > ul {
border-top: none;
}
#dispatch-list-container ul {
padding-left: 0;
}
#dispatch-list-container li {
border: none;
}
#dispatch-list-container li.petition-key-value {
padding: 0.5rem 0;
}
#dispatch-list-container li.env-source-key-value-newgroup {
border-top: 1px solid var(--cmg-color-bg-005);
}
#dispatch-list-container .field,
#dispatch-list-container fieldset {
display: block;
Expand Down Expand Up @@ -2116,6 +2125,15 @@ body.start .submit {
ul#view_Petitions.form-list {
border-top: none;
}
ul#view_Petitions.form-list li {
overflow-x: unset;
}
ul#view_Petitions.form-list li.history-table {
overflow-x: auto;
}
ul#view_Petitions ul li:focus-within {
background: unset;
}
ul.form-list li.petition-status-title {
margin-top: 0.5rem;
margin-bottom: -1rem;
Expand Down Expand Up @@ -2151,29 +2169,41 @@ ul.form-list li.petition-enrollee-items .petition-inline-value,
ul.form-list li.petition-enrollee-items .petition-inline-value a {
font-family: var(--cmg-font-semibold);
}
.env-source-key {
font-size: 0.9em;
}
ul#view_Petitions.form-list li.env-source-key-value-newgroup {
border-top: 1px solid var(--cmg-color-bg-005);
}
.petition-step-modified {
margin-right: 1em;
}
.petition-attrs {
padding: 0;
box-shadow: inset 0 0 0.5rem 0 rgba(0,0,0,0.1);
}
.petition-attrs h3 {
padding: 0.75em;
padding: 1rem 1rem 0;
margin: 0;
font-size: 1.2em;
background-color: var(--cmg-color-bg-002);
font-weight: 600;
border-top: 1px solid var(--cmg-color-bg-006);
}
.petition-attrs h4 {
font-size: 0.9em;
margin: 0 0 0.25em;
}
.petition-attrs > ul {
padding: 0;
border: 0.75em solid var(--cmg-color-bg-002);
padding: 0 0 1rem;
border-top: none;
}
.petition-attrs > ul > li {
padding: 0.75em;
padding: 0.5rem 1rem;
border: none;
background-color: unset;
}
.petition-attrs > ul.env-source-attrs {
margin-top: 1rem;
}
ul.petition-attrs-subset {
padding: 0;
Expand Down
16 changes: 10 additions & 6 deletions app/webroot/css/co-responsive.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,13 +100,12 @@
ul#view_Petitions.form-list .field {
align-items: start;
}
.petition-attrs h3 {
padding: 0.75em 1em 0;
}
.petition-attrs > ul {
display: grid;
grid-template-columns: 1fr 1fr;
border: 1em solid var(--cmg-color-bg-002);
columns: 2;
column-rule: 1px solid var(--cmg-color-bg-005);
}
.petition-attrs > ul > li {
break-inside: avoid;
}
/* PERSON CANVAS / CARDS */
.co-cards .field-data-container {
Expand Down Expand Up @@ -648,6 +647,11 @@
border: 1px solid var(--cmg-color-bg-006);
border-radius: 1em;
}
/* PETITIONS */
.petition-key-value {
display: grid;
grid-template-columns: 1fr 1fr;
}
}

/* EXTRA LARGE */
Expand Down

0 comments on commit 53236fd

Please sign in to comment.