Skip to content

Commit cb9bf76

Browse files
committed
Showing proper callout information when group planting is in progress.
1 parent ae68357 commit cb9bf76

File tree

3 files changed

+41
-1
lines changed

3 files changed

+41
-1
lines changed

src/locales/cs.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,10 @@
9292
"app.groupsSupervisor.currentlyManagedGroups": "Skupiny",
9393
"app.groupsSupervisor.notSuperadmin": "Tato stránka je k dispozici pouze administrátorům ReCodExu.",
9494
"app.groupsSupervisor.plantTermButton": "Osadit skupiny pro",
95+
"app.groupsSupervisor.plantTermGroupsExplanation": "Organizační skupiny budou vytvořeny pro vybraný semestr s následujícími názvy a popisy:",
9596
"app.groupsSupervisor.plantTermGroupsInfo": "Osazování skupin pro semestr {termLabel}",
9697
"app.groupsSupervisor.plantTermGroupsModal.title": "Nastavit parametry skupin pro semestr",
98+
"app.groupsSupervisor.plantTermGroupsSelectParents": "Prosíme, vybertete předměty, do kterých budou semestrální skupiny osazeny.",
9799
"app.groupsSupervisor.title": "Spravovat všechny skupiny a jejich vazby",
98100
"app.groupsTeacher.aboutStudentsInfo": "Studenti nejsou do skupiny přidáni automaticky, ale mohou se do skupiny připojit sami prostřednictvím rozšíření SIS-CodEx.",
99101
"app.groupsTeacher.bindGroupInfo": "Vybraný událost bude svázána s existující cílovou skupinou, kterou můžete vybrat níže.",

src/locales/en.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,10 @@
9292
"app.groupsSupervisor.currentlyManagedGroups": "Groups",
9393
"app.groupsSupervisor.notSuperadmin": "This page is available to ReCodEx administrators only.",
9494
"app.groupsSupervisor.plantTermButton": "Plant groups for",
95+
"app.groupsSupervisor.plantTermGroupsExplanation": "Organizational groups will be created for the selected term using the following names and descriptions:",
9596
"app.groupsSupervisor.plantTermGroupsInfo": "Planting groups for term {termLabel}",
9697
"app.groupsSupervisor.plantTermGroupsModal.title": "Define Group Parameters for Term",
98+
"app.groupsSupervisor.plantTermGroupsSelectParents": "Please, select courses in which the term groups will be planted.",
9799
"app.groupsSupervisor.title": "Manage All Groups and Their Associations",
98100
"app.groupsTeacher.aboutStudentsInfo": "The students are not automatically added to the group, but they can join the group themselves via SIS-CodEx extension.",
99101
"app.groupsTeacher.bindGroupInfo": "The selected event will be bound to an existing target group which you can select below.",

src/pages/GroupsSuperadmin/GroupsSuperadmin.js

Lines changed: 37 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import React, { Component } from 'react';
22
import PropTypes from 'prop-types';
33
import ImmutablePropTypes from 'react-immutable-proptypes';
44
import { connect } from 'react-redux';
5-
import { Modal, Badge, Dropdown, ButtonGroup } from 'react-bootstrap';
5+
import { Modal, Badge, Dropdown, ButtonGroup, Row, Col } from 'react-bootstrap';
66
import { FormattedMessage } from 'react-intl';
77
import { FORM_ERROR } from 'final-form';
88

@@ -18,6 +18,7 @@ import Icon, { CloseIcon, GroupIcon, ManagementIcon } from '../../components/ico
1818
import ResourceRenderer from '../../components/helpers/ResourceRenderer';
1919
import Button from '../../components/widgets/TheButton';
2020
import Callout from '../../components/widgets/Callout';
21+
import Markdown from '../../components/widgets/Markdown';
2122

2223
import { fetchAllGroups, addGroupAttribute, removeGroupAttribute } from '../../redux/modules/groups.js';
2324
import { fetchAllTerms } from '../../redux/modules/terms.js';
@@ -127,6 +128,41 @@ class GroupsSuperadmin extends Component {
127128
/>
128129
</h5>
129130

131+
<FormattedMessage
132+
id="app.groupsSupervisor.plantTermGroupsExplanation"
133+
defaultMessage="Organizational groups will be created for the selected term using the following names and descriptions:"
134+
/>
135+
136+
<Row>
137+
<Col xs={12} xl={6}>
138+
<div className="border border-success-subtle rounded-1 p-3 pb-0 my-2">
139+
<h5 className="text-muted">
140+
<Icon icon={['far', 'flag']} gapRight />
141+
<FormattedMessage id="app.plantTermGroupsForm.czech" defaultMessage="Czech" />
142+
</h5>
143+
<strong>{this.state.plantTexts.cs.name}</strong>
144+
<Markdown source={this.state.plantTexts.cs.description} />
145+
</div>
146+
</Col>
147+
<Col xs={12} xl={6}>
148+
<div className="border border-success-subtle rounded-1 p-3 pb-0 my-2">
149+
<h5 className="text-muted">
150+
<Icon icon={['far', 'flag']} gapRight />
151+
<FormattedMessage id="app.plantTermGroupsForm.english" defaultMessage="English" />
152+
</h5>
153+
<strong>{this.state.plantTexts.en.name}</strong>
154+
<Markdown source={this.state.plantTexts.en.description} />
155+
</div>
156+
</Col>
157+
</Row>
158+
159+
<p>
160+
<FormattedMessage
161+
id="app.groupsSupervisor.plantTermGroupsSelectParents"
162+
defaultMessage="Please, select courses in which the term groups will be planted."
163+
/>
164+
</p>
165+
130166
<Button variant="secondary" size="sm" onClick={this.cancelGroupPlanting}>
131167
<CloseIcon gapRight />
132168
<FormattedMessage id="generic.cancel" defaultMessage="Cancel" />

0 commit comments

Comments
 (0)