Branch do lucas

src/Components/PageProfessorComponents/PartOne.js

@@ -12,7 +12,7 @@ import {ButtonCancelar} from './PartTwo.js'
 import axios from 'axios'
 import FormInput from '../FormInput.js'
 
-function sortDict (dict) {
+export function sortDict (dict) {
     const newDict = dict.sort((a, b) => (a.name) > (b.name) ? 1 : -1)
     return newDict
 
@@ -31,7 +31,9 @@ export default function PartOne (props) {
     const [uf, setUF] = useState(
         {
             algumFoiEscolhido : false,
-            value : ''
+            selected : '', //id
+            name : '',
+            abbreviation : ''
         }
     )
 
@@ -39,27 +41,28 @@ export default function PartOne (props) {
     const [municipio, setMunicipio] = useState(
         {
             algumFoiEscolhido : false,
-            value : ''
+            selected : '',
+            name : ''
         }
     )
 
     const [codigoINEP, setCodigoINEP] = useState(
         {
             codigoInvalido : false,
-            value : ''
+            selected : ''
         }
     )
     const handleCodigoINEP = (event) => {
         const code = event.target.value
-        
+
         setCodigoINEP({...codigoINEP,
             codigoInvalido : false,
-            value : code
+            selected : code
         })
     }
 
     const validateINEP = () => {
-        const code = codigoINEP.value
+        const code = codigoINEP.selected
 
         axios.get(('https://www.simcaq.c3sl.ufpr.br/api/v1/portal_mec_inep?filter=school_cod:' + code)
         ).then( (response) => {
@@ -67,14 +70,15 @@ export default function PartOne (props) {
         }, (error) => {
             setCodigoINEP({...codigoINEP,
                 codigoInvalido : true,
-                value : ''
+                selected : ''
             })
         }
         )
     }
 
     const handleSubmit = () => {
-        props.handleBuscar(uf.value, municipio.value, codigoINEP.value)
+        console.log('handle submit : ', uf.abbreviation, uf.selected, municipio.name, municipio.selected, codigoINEP.value)
+        props.handleBuscar(uf.abbreviation, uf.selected, municipio.name, municipio.selected, codigoINEP.value)
     }
 
     //on render component, call simcaq api and update ufList
@@ -87,10 +91,14 @@ export default function PartOne (props) {
     }, [])
 
     const handleChooseUF = (event) => {
-        const ufID = event.target.value
+        const ufID = event.target.value.ufID
+        const ufAbbreviation = event.target.value.abbreviation
+        const ufName = event.target.value.name
         setUF({...uf,
                 algumFoiEscolhido : true,
-                value : ufID
+                selected : ufID,
+                name : ufName,
+                abbreviation : ufAbbreviation
             }
         )
 
@@ -102,10 +110,12 @@ export default function PartOne (props) {
     }
 
     const handleChooseCity = (event) => {
-        const cityID = event.target.value
+        const cityID = event.target.value.id
+        const cityName = event.target.value.name
         setMunicipio({...municipio,
                  algumFoiEscolhido : true,
-                 value : cityID
+                 selected : cityID,
+                 name : cityName
              }
         )
     }
@@ -123,12 +133,12 @@ export default function PartOne (props) {
                      <Select
                        labelId="demo-simple-select-label"
                        id="demo-simple-select"
-                       value={uf.value}
+                       value={uf.name}
                        onChange={handleChooseUF}
                      >
                      {
                         ufList.map( (ufs)=>
-                            <MenuItem value={ufs.id}>{ufs.name}</MenuItem>
+                            <MenuItem key={ufs.id} value={{abbreviation : ufs.abbreviation, ufID : ufs.id, name : ufs.name}}>{ufs.name}</MenuItem>
                         )
                      }
                      </Select>
@@ -138,12 +148,12 @@ export default function PartOne (props) {
                      <Select
                        labelId="demo-simple-select-label"
                        id="demo-simple-select"
-                       value={municipio.value}
+                       value={municipio.name}
                        onChange={handleChooseCity}
                      >
                      {
                         municipioList.map( (cidades)=>
-                            <MenuItem value={cidades.id}>{cidades.name}</MenuItem>
+                            <MenuItem value={{id : cidades.id, name : cidades.name}}>{cidades.name}</MenuItem>
                         )
                      }
                      </Select>
@@ -169,7 +179,7 @@ export default function PartOne (props) {
                          <FormInput
                            inputType={'text'}
                            name={'Código INEP'}
-                           value={codigoINEP.value}
+                           value={codigoINEP.selected}
                            handleChange = {handleCodigoINEP}
                            placeholder={'Código INEP'}
                            required={true}
@@ -188,7 +198,7 @@ export default function PartOne (props) {
             </Content>
             <Divider/>
             <ButtonsArea>
-                <ButtonCancelar>CANCELAR VERIFICAÇÃO</ButtonCancelar>
+                <ButtonCancelar onClick={props.handleCancelar}>CANCELAR VERIFICAÇÃO</ButtonCancelar>
             </ButtonsArea>
         </>
     )