Skip to content

Commit 25d4f3a

Browse files
committed
Only show degree sessions when enabled.
1 parent 5b10d03 commit 25d4f3a

6 files changed

Lines changed: 23 additions & 7 deletions

File tree

backend/src/Controller/Api/v1/DashboardController.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ function index() {
9393

9494
$data = [
9595
'submitted_count' => $submitted_count,
96+
'degree_sessions_enabled' => $this->degree_sessions_enabled,
9697
'submitted_thesis_defenses_count' => $submitted_thesis_defenses_count,
9798
'proposal_comments' => $proposal_comments,
9899
'proposal_submission_counts' => $this->get_submission_counts($this->Proposals, 'submitted_date', $months),

backend/src/Controller/Api/v1/RestController.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,8 @@ function status() {
171171
$this->JSONResponse(ResponseCode::Ok, [
172172
'settings' => $safe_settings,
173173
'user' => $this->user,
174-
'form_templates_enabled' => $this->form_templates_enabled
174+
'form_templates_enabled' => $this->form_templates_enabled,
175+
'degree_sessions_enabled' => $this->degree_sessions_enabled
175176
]);
176177
}
177178

@@ -182,4 +183,3 @@ protected function paginateQuery($query) {
182183
}
183184

184185
?>
185-

backend/src/Controller/AppController.php

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,10 @@ class AppController extends Controller
139139

140140
public ?User $user = null;
141141

142+
public bool $form_templates_enabled = false;
143+
144+
public bool $degree_sessions_enabled = false;
145+
142146
private function setupTableViews() {
143147
$this->request->addDetector(
144148
'xlsx',
@@ -209,6 +213,8 @@ public function initialize() : void
209213

210214
$this->form_templates_enabled = TableRegistry::getTableLocator()->get('formTemplates')->find()
211215
->where(['enabled' => true])->count() > 0;
216+
$this->degree_sessions_enabled = TableRegistry::getTableLocator()->get('degreeSessions')->find()
217+
->count() > 0;
212218

213219
$this->set('capsVersion', Application::getVersion());
214220
$this->set('capsShortVersion', Application::getShortVersion());
@@ -217,6 +223,7 @@ public function initialize() : void
217223
$this->set('user', $this->user);
218224
$this->set('settings', $this->getSettings());
219225
$this->set('form_templates_enabled', $this->form_templates_enabled);
226+
$this->set('degree_sessions_enabled', $this->degree_sessions_enabled);
220227

221228
$this->handleSecrets();
222229

backend/templates/element/sidebar.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,12 +86,14 @@
8686
</li>
8787
<?php endif; ?>
8888

89+
<?php if ($degree_sessions_enabled): ?>
8990
<li class="nav-item">
9091
<a class="nav-link" href="<?= $this->Url->build(['controller' => 'thesisDefenses', 'action' => 'add']); ?>">
9192
<i class="fas mr-1 fa-graduation-cap"></i>
9293
<span>Domanda di laurea</span>
9394
</a>
9495
</li>
96+
<?php endif; ?>
9597

9698
<?php endif; ?>
9799

@@ -133,12 +135,14 @@
133135
</a>
134136
</li>
135137

138+
<?php if ($degree_sessions_enabled): ?>
136139
<li class="nav-item<?= $controllerName == 'ThesisDefenses' ? ' active' : '' ?>">
137140
<a class="nav-link" href="<?= $this->Url->build(['controller' => 'thesisDefenses', 'action' => 'index']) ?>">
138141
<i class="fas mr-1 fa-user-graduate"></i>
139142
<span>Domande di laurea</span>
140143
</a>
141144
</li>
145+
<?php endif; ?>
142146

143147
<li class="nav-item<?= $controllerName == 'Logs' ? ' active' : '' ?>">
144148
<a class="nav-link caps-form-link" href="<?= $this->Url->build([

frontend/src/components/Dashboard.jsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ class Dashboard extends CapsPage {
1818
return <>
1919
<h1>Pannello di controllo</h1>
2020
<div className="row">
21+
{this.props.data.degree_sessions_enabled &&
2122
<div className="col-xl-3 col-md-6 mb-4">
2223
<div className="card shadow border-left-warning h-100">
2324
<div className="card-body">
@@ -37,7 +38,7 @@ class Dashboard extends CapsPage {
3738
</div>
3839
</div>
3940
</div>
40-
</div>
41+
</div>}
4142
<div className="col-xl-3 col-md-6 mb-4">
4243
<div className="card shadow border-left-warning">
4344
<div className="card-body">

frontend/src/components/UserProfile.jsx

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ class UserProfile extends CapsPage {
1717
'settings': undefined,
1818
'logged_user': null,
1919
'form_templates_enabled': null,
20+
'degree_sessions_enabled': null,
2021
'user': undefined,
2122
'proposals': undefined,
2223
'forms': undefined,
@@ -37,7 +38,8 @@ class UserProfile extends CapsPage {
3738
await this.setStateAsync({
3839
'settings': status.settings,
3940
'logged_user': status.user,
40-
'form_templates_enabled': status.form_templates_enabled
41+
'form_templates_enabled': status.form_templates_enabled,
42+
'degree_sessions_enabled': status.degree_sessions_enabled
4143
});
4244
this.loadUserData();
4345
} catch (err) {
@@ -54,7 +56,7 @@ class UserProfile extends CapsPage {
5456
this.loadProposals();
5557
this.loadForms();
5658
this.loadDocuments();
57-
this.loadThesisDefenses();
59+
if (this.state.degree_sessions_enabled) this.loadThesisDefenses();
5860
} catch (err) {
5961
this.flashCatch(err);
6062
}
@@ -210,10 +212,11 @@ class UserProfile extends CapsPage {
210212
proposals={this.state.proposals}
211213
onProposalDeleteClicked={this.onProposalDeleteClicked.bind(this)}>
212214
</ProposalsBlock>
215+
{this.state.degree_sessions_enabled &&
213216
<ThesisDefensesBlock className="mt-4"
214217
defenses={this.state.thesis_defenses}
215218
root={this.props.root}>
216-
</ThesisDefensesBlock>
219+
</ThesisDefensesBlock>}
217220
{(this.state.form_templates_enabled || (this.state.forms && this.state.forms.length>0))&&
218221
<FormsBlock className="mt-4"
219222
onDeleteClicked={this.onFormDeleteClicked.bind(this)}
@@ -223,7 +226,7 @@ class UserProfile extends CapsPage {
223226
</FormsBlock>}
224227
{this.state.logged_user.admin &&
225228
<>
226-
<h2>Documenti e allegati</h2>
229+
<h2 className="mt-4">Documenti e allegati</h2>
227230
<DocumentsBlock className="mt-4"
228231
loadingDocument={this.state.loadingDocument}
229232
documents={this.state.documents}

0 commit comments

Comments
 (0)