Bladeren bron

superassing

amenpunk 2 jaren geleden
bovenliggende
commit
bfb9cf5987
4 gewijzigde bestanden met toevoegingen van 22 en 13 verwijderingen
  1. 1 1
      src/Components/HomeUser/TestCard.jsx
  2. 1 1
      src/Pages/HomeUser.jsx
  3. 5 2
      src/Pages/Logincs.jsx
  4. 15 9
      src/Pages/Prueba.jsx

+ 1 - 1
src/Components/HomeUser/TestCard.jsx

@@ -21,7 +21,7 @@ export function TestCard(props) {
21 21
                 />
22 22
                 <CardContent>
23 23
                     <Typography gutterBottom variant="h5" component="div">
24
-                        {test.nombre}
24
+                       {test.nombre}
25 25
                     </Typography>
26 26
                     <Typography variant="body2" color="text.secondary">
27 27
                         {test.descripcion}

+ 1 - 1
src/Pages/HomeUser.jsx

@@ -12,7 +12,6 @@ export function HomeUser(){
12 12
   const [password, setPasword] = useState({});
13 13
   const token = useSelector( state => state.token.token);
14 14
   const profile = useSelector( state => state.user.profile);
15
-  console.log(profile)
16 15
 
17 16
   useEffect(() => {
18 17
     let { email , password} = profile
@@ -20,6 +19,7 @@ export function HomeUser(){
20 19
     rest
21 20
       .get(token.token)
22 21
       .then(({ data }) => {
22
+        console.log('plaza contrasenia: ', data)
23 23
         setTests(data.tests)
24 24
         delete data.tests
25 25
         setPasword(data);

+ 5 - 2
src/Pages/Logincs.jsx

@@ -68,11 +68,12 @@ export function LoginCs() {
68 68
         .then(response => {
69 69
 
70 70
           console.log("Service Response :: ", response)
71
-          let { token, nombre, apelidos, id: pass_id } = response;
71
+          let { token, nombre, apelidos, id: pass_id, idSueperContrasenia } = response;
72 72
           toast.success(`Bienvenido ${nombre} ${apelidos}!!`)
73 73
           token = token.replace("Bearer ", "")
74 74
           let { exp } = jwt_decode(token);
75 75
           let body_token = jwt_decode(token);
76
+          console.log('body_toke: ', body_token)
76 77
           body_token['pass'] = password;
77 78
           body_token['passid'] = pass_id;
78 79
 
@@ -83,8 +84,10 @@ export function LoginCs() {
83 84
             password,
84 85
             passid: pass_id,
85 86
             pass: password,
86
-            assingid: 'ok'
87
+            assingid: 'ok',
88
+            idsuperpwd: idSueperContrasenia
87 89
           }
90
+
88 91
           setTimeout(() => alert("Token Expirado"), exp_in)
89 92
           setTimeout(() => {
90 93
             setOpen(false)

+ 15 - 9
src/Pages/Prueba.jsx

@@ -17,15 +17,19 @@ export function Prueba() {
17 17
   let dispatch = useDispatch();
18 18
   let [data, setData] = useState({});
19 19
 
20
+  console.log('PROFILE: ', profile)
21
+
20 22
   useState(() => {
21 23
     let rest = new Service(`/prueba/findid/${id}`)
22 24
     rest.get(auth.token)
23
-      .then(resp => { 
24
-          setData(resp.data)
25
-        })
25
+      .then(resp => {
26
+        setData(resp.data)
27
+      })
26 28
       .catch(_e => setData({}))
27 29
   }, [id])
28 30
 
31
+  console.log('Prueba info: ', data)
32
+
29 33
   const CreateAssign = () => {
30 34
 
31 35
     let now = new Date().toISOString();
@@ -37,10 +41,12 @@ export function Prueba() {
37 41
       "score": "0",
38 42
       "mensaje": "0",
39 43
       "mensaje2": "0",
44
+      "candidatoinpwd_id": profile.profile.idsuperpwd,
40 45
       //candidatoinpwd -> idSuperContraseña -> viene al hacer login
41
-      "idcontrasenia": profile.role.passid, // ya no se va enviar
42
-      "nombre": "assing CLEVAERR"
46
+      "idcontrasenia": profile.role.pass, // ya no se va enviar
47
+      "nombre": "assing CLEVAERR",
43 48
       //cattest_id // catalogo de examenes -> viene del api del catalogo del admin
49
+      "cattest_id": data.id
44 50
     }
45 51
 
46 52
     let rest = new Service("/prueba/asignacion");
@@ -55,23 +61,23 @@ export function Prueba() {
55 61
       })
56 62
   }
57 63
 
58
-  if(profile.role.assingid){
64
+  if (profile.role.assingid) {
59 65
     return <Cleaver />
60 66
   }
61 67
 
62 68
   return (
63
-    <div  className="content-section">
69
+    <div className="content-section">
64 70
       <div className="main">
65 71
         <Box >
66 72
           <Paper>
67
-            <Header/>
73
+            <Header />
68 74
           </Paper>
69 75
           <Paper className="prueba_body" elevation={1}>
70 76
             <h1>{data?.nombre}</h1>
71 77
             <Divider />
72 78
             <Typography style={{ marginTop: 15, textAlign: 'center' }}>{data?.decription}</Typography>
73 79
             <Divider style={{ marginTop: 15 }} />
74
-            <Button  variant="contained" onClick={CreateAssign}>Inicar Prueba</Button>
80
+            <Button variant="contained" onClick={CreateAssign}>Inicar Prueba</Button>
75 81
           </Paper>
76 82
         </Box>
77 83
         <Toaster