Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

mudanças em GCES 2018.2 #211

Open
wants to merge 81 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
81 commits
Select commit Hold shift + click to select a range
cfcb41b
Fixes build in docker environment
andre-filho Sep 11, 2018
9787dc7
Adding script to set environment variables.
lucaaas Sep 11, 2018
f9aaa78
Fixes typo at contributing.md
andre-filho Sep 20, 2018
b13a876
Removes files that was in repo but should be ignored
andre-filho Sep 28, 2018
6396926
Added commiter, docker troubleshooting and modified readme and variab…
andre-filho Sep 28, 2018
56c6853
Added forgotten chmod to script file at dockerfile
andre-filho Sep 28, 2018
1259c45
Fixes the variables script call
andre-filho Oct 3, 2018
e711951
Fixes the variables script call
andre-filho Oct 3, 2018
6fa3002
Added comments into variables.sh
andre-filho Oct 4, 2018
93f8ff7
Merge branch 'docker-build' of github.com:gces-2018-merenda-mais/2017…
andre-filho Oct 9, 2018
2891231
Added new icons to all platforms and editorconfig file
andre-filho Oct 9, 2018
826b9d5
Added maps depedencies and comments at schedulemeeting
andre-filho Oct 15, 2018
9c0d3d9
Refactored cpf validation to be in component's inside.
lucaaas Oct 17, 2018
734e40f
Refactored name validation to be in component's inside.
hugo-asb Oct 18, 2018
0cd1f65
Refactored email validation to be in component's inside.
lucaaas Oct 18, 2018
59fb7a9
Merge branch '166#validate_fields' of https://github.com/gces-2018-me…
hugo-asb Oct 18, 2018
7a7ed54
Updating name validation.
hugo-asb Oct 18, 2018
c0e10bd
Refactored dropdown validation to be in component's inside.
lucaaas Oct 18, 2018
3c3abb3
Merge branch '166#validate_fields' of https://github.com/gces-2018-me…
lucaaas Oct 18, 2018
6974d70
Refactored phone validation to be in component's inside.
hugo-asb Oct 18, 2018
2a93038
Refactored password validation to be in component's inside (not ready…
lucaaas Oct 20, 2018
a2955d4
Merge branch '166#validate_fields' of github.com:gces-2018-merenda-ma…
lucaaas Oct 20, 2018
1244092
Correcting bug on login email field.
hugo-asb Oct 24, 2018
7d0af82
Organized custom exception classes into separate folder and file stru…
andre-filho Nov 4, 2018
bbc7665
Organized and renamed custom error handlers
andre-filho Nov 4, 2018
c0dc975
Creating Register Style file
gustavo2795 Nov 6, 2018
1e54e4b
Creating Complaint style file
gustavo2795 Nov 6, 2018
9012d5f
Creating InitialScreen style file
gustavo2795 Nov 6, 2018
b96f2d9
Creating LoginScreen style file
gustavo2795 Nov 6, 2018
9988e51
Creating MainScreen style file and correcting names of files
gustavo2795 Nov 6, 2018
1108973
Creating MeetingInvites style file
gustavo2795 Nov 6, 2018
ff1d7a6
Creating PrincipalNotifications style file
gustavo2795 Nov 6, 2018
c42390b
Creating SchoolInfoScreen style file
gustavo2795 Nov 6, 2018
e2f484d
Creating SearchSchool style file
gustavo2795 Nov 6, 2018
474f7b0
Creating UpdateInfoScreen style file and removing unusable imports
gustavo2795 Nov 6, 2018
f4ae664
Creating VisitInvites styles file
gustavo2795 Nov 6, 2018
60fb0ed
Creating LegislationStyles folder and LawNumber11947 style
gustavo2795 Nov 6, 2018
2a4c8e6
Creating LawNumber12982 style file
gustavo2795 Nov 6, 2018
51f449a
Creating MainLegislationScreen style file
gustavo2795 Nov 6, 2018
11dc439
Creating Resolution1 style file
gustavo2795 Nov 6, 2018
ce26fd5
Creating Resolution26Screen style file
gustavo2795 Nov 6, 2018
c12afb1
Creating ManageConselors style folder and ManageAcceptedRegisters sty…
gustavo2795 Nov 6, 2018
3193c83
Creating ManageNotAcceptedRegisters style file
gustavo2795 Nov 6, 2018
68bb783
Creating PrincipalManageRegister style file
gustavo2795 Nov 6, 2018
709994c
Creating MainReportsScreen style file
gustavo2795 Nov 6, 2018
7b2f22c
Creating ScheduleMeeting style file
gustavo2795 Nov 6, 2018
95ec0fe
Creating StartInspectionFolder and PrincipalStartInspection style file
gustavo2795 Nov 6, 2018
894e4f4
Creating StartAlreadyInspectionedInspection style file
gustavo2795 Nov 6, 2018
1a1757e
Creating StartExpiredInspection style file
gustavo2795 Nov 6, 2018
f173d4f
Creating StartPendingINspection style file
gustavo2795 Nov 6, 2018
2934315
Merge pull request #6 from gces-2018-merenda-mais/clean-code-gustavo
gustavo2795 Nov 8, 2018
cee6d2e
Merge pull request #5 from gces-2018-merenda-mais/clean-code-andre
gustavo2795 Nov 8, 2018
feadf68
Merge pull request #8 from gces-2018-merenda-mais/fix-contributing
gustavo2795 Nov 8, 2018
685f2db
Merge branch 'development' into 166#validate_fields
gustavo2795 Nov 8, 2018
f78c16e
Merge pull request #7 from gces-2018-merenda-mais/166#validate_fields
gustavo2795 Nov 8, 2018
c32c021
Refactoring the show agents email to a component
andre-filho Nov 16, 2018
6e467d0
Refactoring invitedcounselorsdata field rendering approach
andre-filho Nov 16, 2018
3e20798
Applied created boldtext component to schooldata.js
andre-filho Nov 20, 2018
ec694fc
Creating constant codes file.
hugo-asb Nov 22, 2018
4ed7ff7
Creating constant links file.
hugo-asb Nov 22, 2018
b58f3f4
Creating counselor constants file.
hugo-asb Nov 22, 2018
7295dd0
Creating checklist constants file.
hugo-asb Nov 22, 2018
ec4468d
Creating alerts titles and messages file.
hugo-asb Nov 22, 2018
dc04f00
Creating toast messages constant file.
hugo-asb Nov 22, 2018
46eb15b
Correcting styles export.
hugo-asb Nov 27, 2018
83c66e5
Correcting Login style.
hugo-asb Nov 27, 2018
1ffbdf3
Removes ci deploy
andre-filho Nov 29, 2018
11a15bb
Merge pull request #9 from gces-2018-merenda-mais/hugo
andre-filho Dec 2, 2018
381da0f
Refacts invite agent to use component labeledfield
andre-filho Dec 4, 2018
27a9d77
Fix lint error
andre-filho Dec 4, 2018
ba169a0
Removes ci deploy
andre-filho Dec 4, 2018
ea16f67
Merge branch 'development' into solid-andre
andre-filho Dec 4, 2018
f9cc589
Fixes lint errors at src/actions
andre-filho Dec 4, 2018
ffe7fc7
Merge conflict at src/actions
andre-filho Dec 4, 2018
4074f8b
Fixes lint errors at src/reducers
andre-filho Dec 4, 2018
19bbcbe
Fixes lint errors at src/constants
andre-filho Dec 4, 2018
57af179
Fixes lint errors at src/components
andre-filho Dec 4, 2018
28540c4
Merge conflict at src/components
andre-filho Dec 4, 2018
c41fd3c
Fixes linter errors on src/containers
andre-filho Dec 4, 2018
c3532d8
Fixes more eslint errors
andre-filho Dec 4, 2018
37f0967
Merge pull request #10 from gces-2018-merenda-mais/solid-andre
gustavo2795 Dec 4, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Refacts invite agent to use component labeledfield
  • Loading branch information
andre-filho committed Dec 4, 2018
commit 381da0f8627a511679d8f090979e3a6736d4101a
31 changes: 19 additions & 12 deletions src/components/InviteAgent.js
Original file line number Diff line number Diff line change
@@ -5,6 +5,7 @@ import { Text, View, TouchableOpacity, ScrollView, ActivityIndicator, Alert } fr
import InvitedCounselorsData from '../components/InvitedCounselorsData';
import styles from '../Styles/SchedulingVisitStyles';
import ShowEmail from './ShowEmail';
import { LabeledField } from './LabeledField';

class InviteAgent extends React.Component {
constructor(props) {
@@ -187,18 +188,24 @@ class InviteAgent extends React.Component {
onPress={() => this.manageInvitedListState(counselor)}
>
<View style={styles.textBox}>
<Text style={styles.text}>
<Text style={styles.ConsuelorInformation}>Nome: </Text>
{counselor.name}
</Text>
<Text style={styles.text}>
<Text style={styles.ConsuelorInformation}>CPF: </Text>
{counselor.profile.cpf}
</Text>
<Text style={styles.text}>
<Text style={styles.ConsuelorInformation}>Telefone: </Text>
{counselor.profile.phone}
</Text>
<LabeledField
label="Nome"
value={counselor.name}
wrapperStyle={styles.text}
labelStyle={styles.ConsuelorInformation}
/>
<LabeledField
label="CPF"
value={counselor.profile.cpf}
wrapperStyle={styles.text}
labelStyle={styles.ConsuelorInformation}
/>
<LabeledField
label="Telefone"
value={counselor.profile.phone}
wrapperStyle={styles.text}
labelStyle={styles.ConsuelorInformation}
/>
</View>
</TouchableOpacity>
</View>
19 changes: 19 additions & 0 deletions src/components/LabeledField.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
import React from 'react';
import PropTypes from 'prop-types';
import { Text, StyleSheet } from 'react-native';

const LabeledField = ({ label, value, wrapperStyle, labelStyle }) => (
<Text style={wrapperStyle}>
<Text style={labelStyle}>{ label }: </Text>
{ value }
</Text>
);

LabeledField.propTypes = {
label: PropTypes.string.isRequired,
value: PropTypes.string.isRequired,
wrapperStyle: PropTypes.StyleSheet.isRequired,
labelStyle: PropTypes.StyleSheet.isRequired,
};

export default LabeledField;