diff --git a/src/actions/auxiliary/getCounselorFromGroupAuxiliary.js b/src/actions/auxiliary/getCounselorFromGroupAuxiliary.js
index e1891a5..6b02520 100644
--- a/src/actions/auxiliary/getCounselorFromGroupAuxiliary.js
+++ b/src/actions/auxiliary/getCounselorFromGroupAuxiliary.js
@@ -33,7 +33,6 @@ export const getCounselorFromGroup = async (codGroup) => {
export const getCounselor = async (counselorLink, linkWithCodMembro) => {
try {
- console.log(counselorLink);
const response = await axios.get(counselorLink);
const auxCodMembro = linkWithCodMembro.substr(linkWithCodMembro.indexOf('membros/'));
const codMembro = auxCodMembro.substr(8);
diff --git a/src/screens/MeetingInvites.js b/src/screens/MeetingInvites.js
index aaa0c6f..f0bfa90 100644
--- a/src/screens/MeetingInvites.js
+++ b/src/screens/MeetingInvites.js
@@ -3,7 +3,6 @@ import {
StyleSheet,
Text,
View,
- TouchableOpacity,
ScrollView,
ActivityIndicator,
BackHandler,
@@ -17,6 +16,10 @@ import Header from '../components/Header';
import LocalizationMapButton from '../components/LocalizationMapButton';
import { backHandlerPop } from '../NavigationFunctions';
import stylesList from '../Styles/ListStyles';
+import { getCounselorDataWithEmail } from '../services/extractDataCounselor';
+import ScheduleCard from '../components/ScheduleCard';
+import getMeetingData from '../services/extractDataMeeting';
+import Button from '../components/Button';
const styles = StyleSheet.create({
principal: {
@@ -103,6 +106,25 @@ const styles = StyleSheet.create({
});
+const buttonBoxStyle = StyleSheet.create({
+ design: {
+ borderColor: 'black',
+ borderWidth: 0.8,
+ borderRadius: 7,
+ backgroundColor: 'white',
+ padding: 8,
+ justifyContent: 'center',
+ marginRight: 15,
+ marginTop: 5,
+ marginBottom: 5,
+ },
+
+ text: {
+ fontSize: 12,
+ textAlign: 'center',
+ },
+});
+
class MeetingInvites extends React.Component {
constructor(props) {
super(props);
@@ -159,26 +181,19 @@ class MeetingInvites extends React.Component {
}
return (
this.props.listOfScheduleMeetingInAGroup.map(meetingSchedule => (
-
-
-
- Data:
- {meetingSchedule.content.date}
-
-
- Horário:
- {meetingSchedule.content.time}
-
-
-
-
+
+
+ />
-
+
))
);
}
@@ -216,20 +231,14 @@ class MeetingInvites extends React.Component {
return (
this.state.invitees.map(counselor => (
-
-
- Nome:
- {counselor.name}
-
-
- E-mail:
- {counselor.email}
-
-
- Telefone:
- {counselor.profile.phone}
-
-
+ {
+ getCounselorDataWithEmail(counselor).map(item => (
+
+ {item.label}
+ {item.value}
+
+ ))
+ }
))
);
@@ -276,14 +285,14 @@ class MeetingInvites extends React.Component {
-
- Data:
- {this.state.meetingSchedule.date}
-
-
- Horário:
- {this.state.meetingSchedule.time}
-
+ {
+ getMeetingData(this.state.meetingSchedule).map(item => (
+
+ {item.label}
+ {item.value}
+
+ ))
+ }
{this.verificationDescription()}
Número de convidados:
diff --git a/src/services/extractDataCounselor.js b/src/services/extractDataCounselor.js
index 5b977fc..37f5a3d 100644
--- a/src/services/extractDataCounselor.js
+++ b/src/services/extractDataCounselor.js
@@ -1,4 +1,4 @@
-const getManagerCounselorData = (counselor) => {
+export const getManagerCounselorData = (counselor) => {
const data = [
{
label: 'Nome:',
@@ -16,4 +16,20 @@ const getManagerCounselorData = (counselor) => {
return data;
};
-export default getManagerCounselorData;
+export const getCounselorDataWithEmail = (counselor) => {
+ const data = [
+ {
+ label: 'Nome:',
+ value: counselor.name,
+ },
+ {
+ label: 'E-mail:',
+ value: counselor.email,
+ },
+ {
+ label: 'Telefone:',
+ value: counselor.profile.phone,
+ },
+ ];
+ return data;
+};
diff --git a/src/services/extractDataMeeting.js b/src/services/extractDataMeeting.js
new file mode 100644
index 0000000..5cab1a6
--- /dev/null
+++ b/src/services/extractDataMeeting.js
@@ -0,0 +1,15 @@
+const getMeetingData = (meeting) => {
+ const data = [
+ {
+ label: 'Data:',
+ value: meeting.date,
+ },
+ {
+ label: 'Horário:',
+ value: meeting.time,
+ },
+ ];
+ return data;
+};
+
+export default getMeetingData;