al fin terminamos

@@ -30,9 +30,6 @@ moment.locale('es-ES')
 
 export default class App extends Component {
 
-  componentWillMount() {
-  }
-
   render() {
     // buscar solicitudes
     // estadisticas
@@ -57,6 +54,9 @@ export default class App extends Component {
         BuscarSolicitudes: { screen: BuscarSolicitudes },
         DetalleSolicitud: { screen: DetalleSolicitud }
       })
+      const AyudaNavigator = createStackNavigator({
+        Ayuda: { screen: Ayuda },
+      })
 
       const DrawerNavigator = createDrawerNavigator({
         MisSolicitudes: {
@@ -84,7 +84,12 @@ export default class App extends Component {
           }),
         },
         Estadisticas: { screen: Estadisticas },
-        Ayuda: { screen: Ayuda },
+        AyudaNavigator: {
+          screen: AyudaNavigator,
+          navigationOptions: () => ({
+            title: 'Ayuda',
+          })
+        }
       }, {
         contentComponent: CustomDrawerContentComponent
       })

+import React, { Component } from 'react'
+import {
+  View,
+} from 'react-native'
+import { connect } from 'react-redux'
+import { Button } from 'react-native-elements'
+
+import { postValoracion } from '../../redux/actions/valoraciones'
+import { postReporte } from '../../redux/actions/reportes'
+
+import css from './style'
+
+const SATISFECHO = 'SATISFECHO'
+const NO_SATISFECHO = 'NO SATISFECHO'
+const INFORMACION_NO_PUBLICADA = 'CONFIDENCIAL'
+class BotonValoracion extends Component {
+
+  render() {
+    if (this.props.mostrar) {
+      const solicitudId = this.props.solicitud.id
+      const usuario = this.props.usuario
+      const likeName = this.props.valoracion.data === SATISFECHO
+        ? 'ios-thumbs-up'
+        : 'ios-thumbs-up-outline'
+
+      const dislikeName = this.props.valoracion.data === NO_SATISFECHO
+        ? 'ios-thumbs-down'
+        : 'ios-thumbs-down-outline'
+
+      const reportName = this.props.reporte.data === INFORMACION_NO_PUBLICADA
+        ? 'ios-megaphone'
+        : 'ios-megaphone-outline'
+
+      return (
+        <View style={[css.buttonFooter]}>
+          <Button
+            onPress={() => this.props.postReporte(solicitudId, usuario, INFORMACION_NO_PUBLICADA)}
+            backgroundColor="white"
+            icon={{
+              name: reportName,
+              size: 27,
+              color: 'red',
+              type: 'ionicon'
+            }}
+          />
+          <Button
+            backgroundColor="white"
+            onPress={() => this.props.postValoracion(solicitudId, usuario, SATISFECHO)}
+            icon={{
+              name: likeName,
+              size: 27,
+              color: 'red',
+              type: 'ionicon'
+            }}
+          />
+          <Button
+            onPress={() => this.props.postValoracion(solicitudId, usuario, NO_SATISFECHO)}
+            backgroundColor="white"
+            icon={{
+              name: dislikeName,
+              size: 27,
+              color: 'red',
+              type: 'ionicon'
+            }}
+          />
+        </View>
+      )
+    }
+    return <View />
+  }
+}
+
+const mapStateToProps = (state) => ({
+  solicitud: state.solicitudes.current,
+  usuario: state.usuario.datos,
+  valoracion: state.valoracion,
+  reporte: state.reporte,
+})
+
+const mapDispatchToProps = (dispatch) => ({
+  postValoracion: (solicitud, usuario, valoracion) =>
+    dispatch(postValoracion(solicitud, usuario, valoracion)),
+  postReporte: (solicitud, usuario, valoracion) =>
+    dispatch(postReporte(solicitud, usuario, valoracion))
+})
+export default connect(mapStateToProps, mapDispatchToProps)(BotonValoracion)

+import { StyleSheet } from 'react-native'
+import { merge } from 'ramda'
+
+import styles from '../../common/styles'
+
+export default merge(StyleSheet.create({
+  buttonFooter: {
+    flexDirection: 'row',
+    justifyContent: 'space-evenly'
+  }
+}), styles)

@@ -3,10 +3,12 @@ import { View, Image, Linking, TouchableOpacity } from 'react-native'
 
 import css from './style'
 
+const innovandoImg = require('../../assets/logos/innovando.png')
+const senaticsImg = require('../../assets/logos/senatics.png')
+
 class FooterSenatics extends Component {
 
   myHandlePress = (link) => () => {
-    console.log('pressed link')
     Linking.openURL(link)
   }
 
@@ -15,12 +17,12 @@ class FooterSenatics extends Component {
         <View style={css.container}>
           <View style={css.card} >
             <TouchableOpacity onPress={this.myHandlePress('http://www.innovando.gov.py')}>
-              <Image style={css.img} source={require('../../assets/logos/innovando.png')} />
+              <Image style={css.img} source={innovandoImg} />
             </TouchableOpacity>
           </View>
           <View style={css.card} >
             <TouchableOpacity onPress={this.myHandlePress('https://www.senatics.gov.py')}>
-              <Image style={css.img} source={require('../../assets/logos/senatics.png')} />
+              <Image style={css.img} source={senaticsImg} />
             </TouchableOpacity>
           </View>
         </View>)

@@ -8,7 +8,6 @@ const imgSrc = require('../../assets/logos/jaikuaamina.png')
 class FooterSenatics extends Component {
 
   myHandlePress = (link) => () => {
-    console.log('pressed link')
     Linking.openURL(link)
   }
             resizeMode='center'

@@ -3,19 +3,16 @@ import { Constants } from 'expo'
 export const STATUS_BAR_HEIGHT = Constants.statusBarHeight
 
 // PROD
-export const AUTH_TOKEN = '730e9175-c76c-418a-a051-7e2834ed7fd7'
-export const CLIENT_SECRET = 'deb7aa26038d0f44a35cd3e1d2f60b5c0e11192ddd0f9430c0d64a1101daa11f'
-export const SENATICS_URL = 'https://informacionpublica.paraguay.gov.py:443/portal-core/rest/api'
-
+// export const SENATICS_URL = 'https://informacionpublica.paraguay.gov.py:443/portal-core/rest/api'
 // DEV
-// export const AUTH_TOKEN = '0496164f-8de1-449c-9ce9-af0e0a6ce9fe'
-// export const CLIENT_SECRET = 'a66a1a98eb7059a5c3b446183e214cc2661326c2994b811cb06dd9d3d873a9e9'
-// export const SENATICS_URL = 'http://192.168.0.26:2128/api'
-export const BACKEND_URL = 'http://192.168.0.26:3000/api'
-export const RENEW_INTERVAL = 1 * 1000 * 60
-export const TOKEN_EXPIRATION = 15 * 1000 * 60
+export const SENATICS_URL = 'http://192.168.0.26:2128/api'
+
+export const BACKEND_URL = 'http://192.168.0.26:3000'
 export const NOTIFICATION_ICON = 'http://ayuda.tesis-jmgo.cnc.una.py/img/jaikuaamina.icon.png'
 export const INFO_PY_URL = 'https://informacionpublica.paraguay.gov.py/portal/'
+export const PORTAL_DENUNCIAS_URL = 'http://www.denuncias.gov.py'
+export const TUTORIAL_AIF_URL = 'https://youtu.be/W8jG3md7YFg'
+export const TUTORIAL_APP = `${BACKEND_URL}/index.html`
 
 export const ESTADOS_SOLICITUDES = {
   finalizados: [

@@ -2629,13 +2629,12 @@
       }
     },
     "buffer": {
-      "version": "4.9.1",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz",
-      "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.1.0.tgz",
+      "integrity": "sha512-YkIRgwsZwJWTnyQrsBTWefizHh+8GYj3kbL1BTiAQ/9pwpino0G7B2gp5tx/FUBqUlvtxV85KNR3mwfAtv15Yw==",
       "requires": {
         "base64-js": "^1.0.2",
-        "ieee754": "^1.1.4",
-        "isarray": "^1.0.0"
+        "ieee754": "^1.1.4"
       }
     },
     "buffer-alloc": {
@@ -5157,8 +5156,7 @@
         },
         "safe-buffer": {
           "version": "5.1.1",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -5250,8 +5248,7 @@
         },
         "yallist": {
           "version": "3.0.2",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         }
       }
     },
@@ -9890,6 +9887,18 @@
         "html-entities": "^1.2.0",
         "htmlparser2": "^3.9.0",
         "stream": "0.0.2"
+      },
+      "dependencies": {
+        "buffer": {
+          "version": "4.9.1",
+          "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz",
+          "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=",
+          "requires": {
+            "base64-js": "^1.0.2",
+            "ieee754": "^1.1.4",
+            "isarray": "^1.0.0"
+          }
+        }
       }
     },
     "react-native-safe-area-view": {
@@ -12613,9 +12622,9 @@
       "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM="
     },
     "uuid": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.0.1.tgz",
-      "integrity": "sha1-ZUS7ot/ajBzxfmKaOjBeK7H+5sE="
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.2.1.tgz",
+      "integrity": "sha512-jZnMwlb9Iku/O3smGWvZhauCf6cvvpKi4BKRiliS3cxnI+Gz9j5MEpTz2UFuXiKPJocb7gnsLHwiS05ige5BEA=="
     },
     "uuid-js": {
       "version": "0.7.5",
@@ -12833,6 +12842,13 @@
         "pegjs": "^0.10.0",
         "simple-plist": "^0.2.1",
         "uuid": "3.0.1"
+      },
+      "dependencies": {
+        "uuid": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.0.1.tgz",
+          "integrity": "sha1-ZUS7ot/ajBzxfmKaOjBeK7H+5sE="
+        }
       }
     },
     "xdl": {

@@ -20,6 +20,7 @@
     "preset": "jest-expo"
   },
   "dependencies": {
+    "buffer": "^5.1.0",
     "elliptic": "^6.4.0",
     "expo": "^27.0.1",
     "moment": "^2.22.2",
@@ -35,6 +36,7 @@
     "redux": "^4.0.0",
     "redux-observable": "^0.19.0",
     "redux-thunk": "^2.3.0",
-    "rxjs": "^5.0.0"
+    "rxjs": "^5.0.0",
+    "uuid": "^3.2.1"
   }
 }

+import EC from 'elliptic'
 import { tap } from 'ramda'
-import { SENATICS_URL } from '../../constants'
+import uuid from 'uuid/v1'
+import { Buffer } from 'buffer/'
+import { ownPrivate } from '../../constants/keys'
+import { BACKEND_URL } from '../../constants'
+
+const ec = new EC.ec('secp256k1')
+const clientPriv = ec.keyFromPrivate(ownPrivate)
 
 export const ACCESS_TOKEN_REQUESTED = 'ACCESS_TOKEN_REQUESTED'
 export const accessTokenRequested = () => ({
@@ -17,24 +24,19 @@ export const accessTokenReceived = (accessToken) => ({
 })
 
 
-const ACCESS_TOKEN_URL = `${SENATICS_URL}/auth/token`
-export const fetchToken = (token, secret) => (dispatch) => {
+export const fetchToken = () => (dispatch) => {
     dispatch(accessTokenRequested())
-
-    const payload = {
-      clientSecret: secret
-    }
-
+    const nonce = uuid()
+    const firma = new Buffer(clientPriv.sign(nonce).toDER()).toString('hex')
     const options = {
-        method: 'POST',
-        body: JSON.stringify(payload),
+        method: 'GET',
         headers: {
           Accept: 'application/json',
           'Content-Type': 'application/json',
-          Authorization: `Basic ${token}`
         },
       }
 
+    const ACCESS_TOKEN_URL = `${BACKEND_URL}/token/${nonce}/${firma}`
     const internal = () => fetch(ACCESS_TOKEN_URL, options)
       .then(response => response.text())
       .then(tap(text => dispatch({ type: 'TEXT_RECEIVED', text })))

@@ -6,9 +6,9 @@ import { fetchTipoRespuestas } from './tipoRespuestas'
 import { comprobarExistenciaUsuarioLocal } from './usuario'
 
 export const INICIALIZAR_DATOS = 'INICIALIZAR_DATOS'
-export const inicializarDatos = (authToken, secret) =>
+export const inicializarDatos = () =>
   (dispatch, getState) =>
-    dispatch(fetchToken(authToken, secret))
+    dispatch(fetchToken())
     .then(() => {
       const accessToken = getState().autenticacion.token
       return Promise.all([

+import EC from 'elliptic'
 import { Permissions, Location } from 'expo'
+import { tap } from 'ramda'
+import { Buffer } from 'buffer/'
+import { ownPrivate } from '../../constants/keys'
+import { BACKEND_URL } from '../../constants'
+
+const ec = new EC.ec('secp256k1')
+const clientPriv = ec.keyFromPrivate(ownPrivate)
 
 export const LOCATION_PERMISSION_REQUESTED = 'LOCATION_PERMISSION_REQUESTED'
 export const locationPermissionRequested = () => ({
@@ -6,8 +14,9 @@ export const locationPermissionRequested = () => ({
 })
 
 export const LOCATION_PERMISSION_GRANTED = 'LOCATION_PERMISSION_GRANTED'
-export const locationPermissionGranted = () => ({
-  type: LOCATION_PERMISSION_GRANTED
+export const locationPermissionGranted = (solicitud) => ({
+  type: LOCATION_PERMISSION_GRANTED,
+  solicitud
 })
 
 export const LOCATION_PERMISSION_DENIED = 'LOCATION_PERMISSION_DENIED'
@@ -21,12 +30,12 @@ export const locationPermissionFailed = (error) => ({
   error
 })
 
-export const requestLocationPermission = () => (dispatch) => {
+export const requestLocationPermission = (solicitud) => (dispatch) => {
   dispatch(locationPermissionRequested())
   return Permissions.askAsync(Permissions.LOCATION)
     .then(({ status }) => {
       if (status === 'granted') {
-        return dispatch(locationPermissionGranted())
+        return dispatch(locationPermissionGranted(solicitud))
       }
       return dispatch(locationPermissionDenied())
     })
@@ -40,9 +49,10 @@ export const locationRequested = () => ({
 })
 
 export const LOCATION_RECEIVED = 'LOCATION_RECEIVED'
-export const locationReceived = (location) => ({
+export const locationReceived = ({ location, solicitud }) => ({
   type: LOCATION_RECEIVED,
-  location
+  location,
+  solicitud
 })
 
 export const LOCATION_FAILED = 'LOCATION_FAILED'
@@ -51,9 +61,53 @@ export const locationFailed = (error) => ({
   error
 })
 
-export const requestLocation = () => (dispatch) => {
+export const requestLocation = (solicitud) => (dispatch) => {
   dispatch(locationRequested())
   Location.getCurrentPositionAsync({})
-    .then(location => dispatch(locationReceived(location)))
+    .then(location => dispatch(locationReceived({ location, solicitud })))
     .catch(error => dispatch(locationFailed(error)))
 }
+
+
+export const LOCATION_POSTED = 'LOCATION_POSTED'
+export const locationPosted = () => ({
+  type: LOCATION_POSTED
+})
+export const LOCATION_POST_FAILED = 'LOCATION_POST_FAILED'
+export const locationPostFailed = (error) => ({
+  type: LOCATION_POST_FAILED,
+  error
+})
+export const LOCATION_POST_SUCCESS = 'LOCATION_POST_SUCCESS'
+export const locationPostSuccess = (result) => ({
+  type: LOCATION_POST_SUCCESS,
+  result
+})
+
+
+export const postLocation = (location, solicitud) => (dispatch) => {
+  dispatch(locationPosted())
+  const message = JSON.stringify({ location, solicitud })
+  const firma = new Buffer(clientPriv.sign(message).toDER()).toString('hex')
+  const options = {
+    method: 'POST',
+    body: message,
+    headers: {
+      Accept: 'application/json',
+      'Content-Type': 'application/json',
+    },
+  }
+
+  const url = `${BACKEND_URL}/solicitudes/ubicacion/${firma}`
+
+  const internal = () => fetch(url, options)
+    .then(response => response.text())
+    .then(tap(text => dispatch({ type: 'TEXT_RECEIVED', text })))
+    .then(JSON.parse)
+    .then(json => {
+      if (json.error) return dispatch(locationPostFailed(json.error))
+      return dispatch(locationPostSuccess(json))
+    })
+    .catch(error => dispatch(locationPostFailed(error)))
+  return internal()
+}

+import EC from 'elliptic'
+import { tap } from 'ramda'
+import { Buffer } from 'buffer/'
+import { BACKEND_URL } from '../../constants'
+import { ownPrivate } from '../../constants/keys'
+
+const ec = new EC.ec('secp256k1')
+const clientPriv = ec.keyFromPrivate(ownPrivate)
+
+export const REPORTE_REQUESTED = 'REPORTE_REQUESTED'
+export const reporteRequested = () => ({
+  type: REPORTE_REQUESTED
+})
+
+export const REPORTE_RECEIVED = 'REPORTE_RECEIVED'
+export const reporteReceived = ({ reporte }) => ({
+  type: REPORTE_RECEIVED,
+  reporte,
+})
+
+export const REPORTE_FAILED = 'REPORTE_FAILED'
+export const reporteFailed = (error) => ({
+  type: REPORTE_FAILED,
+  error
+})
+
+export const requestReporte = (id, email) => (dispatch) => {
+  dispatch(reporteRequested())
+  const url = `${BACKEND_URL}/reportes/solicitud/${id}/usuario/${email}/`
+  const options = {
+    method: 'GET',
+    headers: {
+      Accept: 'application/json',
+    },
+  }
+
+  return fetch(url, options)
+    .then(response => response.text())
+    .then(tap(text => dispatch({ type: 'TEXT_RECEIVED', text })))
+    .then(JSON.parse)
+    .then(json => dispatch(reporteReceived(json)))
+    .catch(error => dispatch(reporteFailed(error)))
+}
+
+
+export const REPORTE_POSTED = 'REPORTE_POSTED'
+export const reportePosted = (reporte) => ({
+  type: REPORTE_POSTED,
+  reporte
+})
+export const REPORTE_POST_FAILED = 'REPORTE_POST_FAILED'
+export const reportePostFailed = () => ({
+  type: REPORTE_POST_FAILED
+})
+export const REPORTE_POST_SUCCESS = 'REPORTE_POST_SUCCESS'
+export const reportePostSuccess = (result) => ({
+  type: REPORTE_POST_SUCCESS,
+  result
+})
+
+
+export const postReporte = (solicitudId, usuario, reporte) => (dispatch) => {
+  dispatch(reportePosted(reporte))
+  const message = JSON.stringify({ reporte, usuario })
+  const firma = new Buffer(clientPriv.sign(message).toDER()).toString('hex')
+
+  const options = {
+    method: 'POST',
+    body: message,
+    headers: {
+      Accept: 'application/json',
+      'Content-Type': 'application/json',
+    },
+  }
+
+
+  const url = `${BACKEND_URL}/solicitudes/${solicitudId}/reporte/${firma}`
+
+  const internal = () => fetch(url, options)
+    .then(response => response.text())
+    .then(tap(text => dispatch({ type: 'TEXT_RECEIVED', text })))
+    .then(JSON.parse)
+    .then(json => {
+      if (json.error) return dispatch(reportePostFailed(json.error))
+      return dispatch(reportePostSuccess(json))
+    })
+    .catch(error => dispatch(reportePostFailed(error)))
+  return internal()
+}

@@ -100,8 +100,9 @@ export const fetchFlujo = (token, solicitudId) => (
 
 
 export const SOLICITUD_POSTED = 'SOLICITUD_POSTED'
-export const solicitudPosted = () => ({
-  type: SOLICITUD_POSTED
+export const solicitudPosted = (solicitud) => ({
+  type: SOLICITUD_POSTED,
+  solicitud
 })
 export const SOLICITUD_POST_FAILED = 'SOLICITUD_POST_FAILED'
 export const solicitudPostFailed = () => ({
@@ -124,7 +125,7 @@ export const notifySolicitud = ({ titulo, institucion }) => () =>
   })
 
 export const postSolicitud = (token, solicitud) => (dispatch) => {
-  dispatch(solicitudPosted())
+  dispatch(solicitudPosted(solicitud))
   const options = {
     method: 'POST',
     body: JSON.stringify(solicitud),
@@ -142,7 +143,10 @@ export const postSolicitud = (token, solicitud) => (dispatch) => {
     .then(response => response.text())
     .then(tap(text => dispatch({ type: 'TEXT_RECEIVED', text })))
     .then(JSON.parse)
-    .then(json => dispatch(solicitudPostSuccess(json)))
+    .then(json => {
+      if (json.error) return dispatch(solicitudPostFailed(json.error))
+      return dispatch(solicitudPostSuccess(json))
+    })
     .catch(error => dispatch(solicitudPostFailed(error)))
   return internal()
 }

+import EC from 'elliptic'
+import { tap } from 'ramda'
+import { Buffer } from 'buffer/'
+import { BACKEND_URL } from '../../constants'
+import { ownPrivate } from '../../constants/keys'
+
+const ec = new EC.ec('secp256k1')
+const clientPriv = ec.keyFromPrivate(ownPrivate)
+
+export const VALORACION_REQUESTED = 'VALORACION_REQUESTED'
+export const valoracionRequested = () => ({
+  type: VALORACION_REQUESTED
+})
+
+export const VALORACION_RECEIVED = 'VALORACION_RECEIVED'
+export const valoracionReceived = ({ valoracion }) => ({
+  type: VALORACION_RECEIVED,
+  valoracion,
+})
+
+export const VALORACION_FAILED = 'VALORACION_FAILED'
+export const valoracionFailed = (error) => ({
+  type: VALORACION_FAILED,
+  error
+})
+
+export const requestValoracion = (id, email) => (dispatch) => {
+  dispatch(valoracionRequested())
+  const url = `${BACKEND_URL}/valoraciones/solicitud/${id}/usuario/${email}/`
+  const options = {
+    method: 'GET',
+    headers: {
+      Accept: 'application/json',
+    },
+  }
+
+  return fetch(url, options)
+    .then(response => response.text())
+    .then(tap(text => dispatch({ type: 'TEXT_RECEIVED', text })))
+    .then(JSON.parse)
+    .then(json => dispatch(valoracionReceived(json)))
+    .catch(error => dispatch(valoracionFailed(error)))
+}
+
+
+export const VALORACION_POSTED = 'VALORACION_POSTED'
+export const valoracionPosted = (valoracion) => ({
+  type: VALORACION_POSTED,
+  valoracion
+})
+export const VALORACION_POST_FAILED = 'VALORACION_POST_FAILED'
+export const valoracionPostFailed = () => ({
+  type: VALORACION_POST_FAILED
+})
+export const VALORACION_POST_SUCCESS = 'VALORACION_POST_SUCCESS'
+export const valoracionPostSuccess = (result) => ({
+  type: VALORACION_POST_SUCCESS,
+  result
+})
+
+
+export const postValoracion = (solicitudId, usuario, valoracion) => (dispatch) => {
+  dispatch(valoracionPosted(valoracion))
+  const message = JSON.stringify({ valoracion, usuario })
+  const firma = new Buffer(clientPriv.sign(message).toDER()).toString('hex')
+
+  const options = {
+    method: 'POST',
+    body: message,
+    headers: {
+      Accept: 'application/json',
+      'Content-Type': 'application/json',
+    },
+  }
+
+
+  const url = `${BACKEND_URL}/solicitudes/${solicitudId}/valoracion/${firma}`
+
+  const internal = () => fetch(url, options)
+    .then(response => response.text())
+    .then(tap(text => dispatch({ type: 'TEXT_RECEIVED', text })))
+    .then(JSON.parse)
+    .then(json => {
+      if (json.error) return dispatch(valoracionPostFailed(json.error))
+      return dispatch(valoracionPostSuccess(json))
+    })
+    .catch(error => dispatch(valoracionPostFailed(error)))
+  return internal()
+}

+import {
+  ACCESS_TOKEN_RECEIVED,
+  fetchToken
+} from '../actions/autenticacion'
+
+export const renewToken = (action$) =>
+  action$.ofType(ACCESS_TOKEN_RECEIVED)
+    .delay(60000)
+    .map(fetchToken)

@@ -11,6 +11,10 @@ import {
 } from './logger'
 
 import {
+  renewToken
+} from './autenticacion'
+
+import {
   askLocationOnPost,
   getLocationOnGrant,
   postLocationOnReceive,
@@ -28,5 +32,6 @@ export default combineEpics(
   postLocationOnReceive,
   searchDebounce,
   changePage,
-  getUserIfExists
+  getUserIfExists,
+  renewToken
 )

@@ -5,19 +5,19 @@ import {
 import {
   requestLocation,
   requestLocationPermission,
+  postLocation,
   LOCATION_PERMISSION_GRANTED,
   LOCATION_RECEIVED
 } from '../actions/location'
 
 export const askLocationOnPost = (action$) =>
   action$.ofType(SOLICITUD_POSTED)
-    .map(requestLocationPermission)
+    .map(action => requestLocationPermission(action.solicitud))
 
 export const getLocationOnGrant = (action$) =>
   action$.ofType(LOCATION_PERMISSION_GRANTED)
-    .map(requestLocation)
+    .map(action => requestLocation(action.solicitud))
 
 export const postLocationOnReceive = (action$) =>
   action$.ofType(LOCATION_RECEIVED)
-    .do(console.log)
-    .ignoreElements()
+    .map(action => postLocation(action.location, action.solicitud))

@@ -29,8 +29,3 @@ export const searchDebounce = (action$, store) =>
 export const changePage = (action$, store) =>
   action$.ofType(CAMBIAR_PAGINA_SOLICITUD)
     .map(() => fetchSolicitudes(getToken(store), getBusqueda(store)))
-
-export const logAll = (action$) =>
-  action$
-  .do(console.log)
-  .ignoreElements()

@@ -78,4 +78,3 @@ export const getUserIfExists = (action$, store) =>
       seleccionarDepartamento(distrito.departamento.id)
     ])
   })
-  .do(console.log)

@@ -3,6 +3,7 @@ import { merge } from 'ramda'
 import {
   REQUEST_FORMATOS,
   RECEIVE_FORMATOS,
+  ERROR_FORMATOS
 } from '../actions/formatos'
 
 
@@ -22,6 +23,10 @@ export default (state, action) => {
       return merge(
         state,
         { loading: false, data: action.formatos, pages: action.pages })
+    case ERROR_FORMATOS:
+      return merge(
+        state,
+        { loading: false, data: [], pages: null })
     default:
       return state || formatos
   }

@@ -9,6 +9,8 @@ import tipoRespuestas from './tipoRespuestas'
 import usuario from './usuario'
 import events from './events'
 import auxiliares from './auxiliares'
+import valoracion from './valoraciones'
+import reporte from './reportes'
 
 
 export default combineReducers({
@@ -21,5 +23,7 @@ export default combineReducers({
   tipoRespuestas,
   usuario,
   events,
-  auxiliares
+  auxiliares,
+  reporte,
+  valoracion
 })

+import { merge } from 'ramda'
+
+import {
+  REPORTE_REQUESTED,
+  REPORTE_RECEIVED,
+  REPORTE_FAILED,
+  REPORTE_POST_SUCCESS,
+  REPORTE_POSTED,
+} from '../actions/reportes'
+
+
+const reporte = {
+  data: [],
+  loading: true,
+  error: null
+}
+
+export default (state, action) => {
+  switch (action.type) {
+  case REPORTE_REQUESTED:
+    return merge(state, reporte)
+  case REPORTE_RECEIVED:
+    return merge(state, { loading: false, error: null, data: action.reporte })
+  case REPORTE_POSTED:
+    return merge(state, { data: action.reporte })
+  case REPORTE_POST_SUCCESS:
+    return merge(state, { data: action.result.reporte })
+  case REPORTE_FAILED:
+    return merge(state, { loading: false, data: null, error: action.error })
+  default:
+    return state || reporte
+  }
+}

-import { merge, mergeAll, filter, contains, mergeDeepRight } from 'ramda'
+import {
+  contains,
+  filter,
+  merge,
+  mergeDeepRight,
+  mergeAll,
+} from 'ramda'
 
 import {
   SOLICITUDES_REQUESTED,
   SOLICITUDES_RECEIVED,
   SOLICITUDES_FAILED,
   VER_DETALLE_SOLICITUD,
-  FLUJOS_RECEIVED, FLUJOS_REQUESTED,
+  FLUJOS_RECEIVED, FLUJOS_REQUESTED, FLUJOS_FAILED,
   SOLICITUD_POST_SUCCESS,
   SOLICITUD_POST_FAILED,
   SOLICITUD_POSTED,
@@ -84,6 +90,9 @@ export default (state, action) => {
     case FLUJOS_RECEIVED:
       return merge(state, { flujos: { loading: false, datos: action.flujos } })
 
+    case FLUJOS_FAILED:
+      return merge(state, { flujos: { loading: false, datos: [], error: action.error } })
+
     case SOLICITUD_POST_SUCCESS:
       return merge(state, { post: { loading: false, error: null, result: action.result } })
 

@@ -3,6 +3,7 @@ import { merge } from 'ramda'
 import {
   REQUEST_SOPORTES,
   RECEIVE_SOPORTES,
+  ERROR_SOPORTES
 } from '../actions/soportes'
 
 
@@ -22,6 +23,10 @@ export default (state, action) => {
       return merge(
         state,
         { loading: false, data: action.soportes, pages: action.pages })
+    case ERROR_SOPORTES:
+      return merge(
+        state,
+        { loading: false, data: [], pages: null })
     default:
       return state || soportes
   }

@@ -3,6 +3,7 @@ import { merge } from 'ramda'
 import {
   REQUEST_TIPO_RESPUESTAS,
   RECEIVE_TIPO_RESPUESTAS,
+  ERROR_TIPO_RESPUESTAS,
 } from '../actions/tipoRespuestas'
 
 
@@ -22,6 +23,10 @@ export default (state, action) => {
       return merge(
         state,
         { loading: false, data: action.tipoRespuestas, pages: action.pages })
+    case ERROR_TIPO_RESPUESTAS:
+      return merge(
+        state,
+        { loading: false, data: [], pages: null })
     default:
       return state || tipoRespuestas
   }

+import { merge } from 'ramda'
+
+import {
+  VALORACION_REQUESTED,
+  VALORACION_RECEIVED,
+  VALORACION_FAILED,
+  VALORACION_POSTED,
+  VALORACION_POST_SUCCESS
+} from '../actions/valoraciones'
+
+
+const valoracion = {
+  data: null,
+  loading: true,
+  error: null
+}
+
+const toggle = (state, val) => {
+  if (state.valoracion === val) {
+    return null
+  }
+  return val
+}
+
+export default (state, action) => {
+  switch (action.type) {
+  case VALORACION_REQUESTED:
+    return merge(state, valoracion)
+  case VALORACION_POSTED:
+    return merge(state, { data: toggle(state, action.valoracion) })
+  case VALORACION_POST_SUCCESS:
+    return merge(state, { data: action.result.valoracion })
+  case VALORACION_RECEIVED:
+    return merge(state, { loading: false, error: null, data: action.valoracion })
+  case VALORACION_FAILED:
+    return merge(state, { loading: false, data: null, error: action.error })
+  default:
+    return state || valoracion
+  }
+}

-import 'moment/locale/es'
 import React, { Component } from 'react'
-import { View, Text } from 'react-native'
+import { Button } from 'react-native-elements'
+import { View, Text, Linking } from 'react-native'
 import { connect } from 'react-redux'
+
+import {
+  PORTAL_DENUNCIAS_URL,
+  TUTORIAL_AIF_URL,
+  TUTORIAL_APP
+} from '../../constants'
+
 import css from './style'
 // AIP Movil
 
-class Estadistica extends Component {
-  static navigationOptions = () => ({
+class Ayuda extends Component {
+  static navigationOptions = ({ navigation }) => ({
     title: 'Ayuda',
     headerStyle: css.headerStyle,
-    headerTitleStyle: css.headerTitleStyle
+    headerTitleStyle: css.headerTitleStyle,
+    headerLeft:
+      <Button
+        icon={{ name: 'menu', size: 27, color: 'white' }}
+        buttonStyle={{ backgroundColor: 'transparent' }}
+        onPress={() => navigation.toggleDrawer()}
+      />
   });
+  myHandlePress = (link) => () => {
+    Linking.openURL(link)
+  }
 
 
   render() {
     return (
-      <View style={[css.pane, css.fixStatusBar]}>
-        <Text> AYUDA </Text>
+      <View style={[css.pane, css.distribute]}>
+        <View>
+          <Text style={css.label}>
+            ¿Quieres saber más?
+          </Text>
+          <Button
+            buttonStyle={css.btn}
+            onPress={this.myHandlePress(TUTORIAL_AIF_URL)}
+            title="Ver Tutorial de Información Pública"
+          />
+          </View>
+        <View>
+          <Text style={css.label}>
+            Aun no sé como usar la App
+          </Text>
+          <Button
+            buttonStyle={css.btn}
+            onPress={this.myHandlePress(TUTORIAL_APP)}
+            title="¿Cómo usar la App?"
+          />
+        </View>
+        <View>
+          <Text style={css.label}>
+            No quiero información... Quiero Denunciar!
+          </Text>
+          <Button
+            buttonStyle={css.btn}
+            onPress={this.myHandlePress(PORTAL_DENUNCIAS_URL)}
+            title="Ir al Portal de Denuncias"
+          />
+        </View>
       </View>
     )
   }
@@ -28,4 +73,4 @@ const mapStateToProps = () => ({
 const mapDispatchToProps = () => ({
 })
 
-export default connect(mapStateToProps, mapDispatchToProps)(Estadistica)
+export default connect(mapStateToProps, mapDispatchToProps)(Ayuda)

 import { StyleSheet } from 'react-native'
 import { merge } from 'ramda'
 
-import styles from '../../common/styles'
+import styles, { colors } from '../../common/styles'
 
 export default merge(StyleSheet.create({
-
+  distribute: {
+    justifyContent: 'space-evenly',
+  },
+  btn: {
+    backgroundColor: colors.primary,
+    margin: 10,
+  },
 }), styles)

@@ -29,8 +29,6 @@ const navegarSiguiente = (self, texto) => {
 
   if (validateEmail(texto)) {
     self.props.navigation.dispatch(pushAction)
-  } else {
-    console.log('no pasar')
   }
 }
 

@@ -35,8 +35,6 @@ const navegarSiguiente = (self, requeridos) => {
   if (validateNext(requeridos)) {
     self.props.navigation.dispatch(resetAction)
     self.props.guardarUsuarioLocal(self.props.usuario)
-  } else {
-    console.log('escribir mensajes de validacion')
   }
 }
 

@@ -7,18 +7,25 @@ import {
 } from 'react-native'
 import { connect } from 'react-redux'
 import { HeaderBackButton } from 'react-navigation'
-import { map } from 'ramda'
-
+import { map, contains } from 'ramda'
 import { Card, Divider, Text, Button } from 'react-native-elements'
 import HTML from 'react-native-render-html'
 
-import { INFO_PY_URL } from '../../constants'
+import { INFO_PY_URL, ESTADOS_SOLICITUDES } from '../../constants'
 import { fetchFlujo } from '../../redux/actions/solicitudes'
+import { requestValoracion } from '../../redux/actions/valoraciones'
+import { requestReporte } from '../../redux/actions/reportes'
+
 import css from './style'
 import DefaultIndicator from '../../components/DefaultIndicator'
+import BotonValoracion from '../../components/BotonValoracion'
 
 const makeSolicitudURL = (solicitud) => `${INFO_PY_URL}/#!/ciudadano/solicitud/${solicitud.id}`
 
+const esFinal = (solicitud) => contains(
+  solicitud.estado.nombre,
+  ESTADOS_SOLICITUDES.finalizados)
+
 class PaginaDetalle extends Component {
   static navigationOptions = ({ navigation }) => ({
       title: 'Detalles de solicitud',
@@ -37,6 +44,8 @@ class PaginaDetalle extends Component {
 
   componentDidMount() {
     this.props.fetchFlujo(this.props.token, this.props.solicitud.id)
+    this.props.requestValoracion(this.props.solicitud.id, this.props.miUsuario.mail)
+    this.props.requestReporte(this.props.solicitud.id, this.props.miUsuario.mail)
   }
 
   render() {
@@ -84,6 +93,11 @@ class PaginaDetalle extends Component {
           </Card>
           {props.flujos.loading ? spinner : flujos(props.flujos.datos)}
         </ScrollView>
+        <BotonValoracion
+          mostrar={esFinal(props.solicitud)}
+          reporte={props.reporte}
+          valoracion={props.valoracion}
+        />
       </View>
       )
     }
@@ -94,10 +108,15 @@ const mapStateToProps = (state) => ({
   token: state.autenticacion.token,
   flujos: state.solicitudes.flujos,
   usuario: state.solicitudes.current.usuario,
+  miUsuario: state.usuario.datos,
+  valoracion: state.valoracion,
+  repote: state.reporte
 })
 
 const mapDispatchToProps = dispatch => ({
-  fetchFlujo: (token, solicitudId) => dispatch(fetchFlujo(token, solicitudId))
+  fetchFlujo: (token, solicitudId) => dispatch(fetchFlujo(token, solicitudId)),
+  requestValoracion: (solicitud, usuario) => dispatch(requestValoracion(solicitud, usuario)),
+  requestReporte: (solicitud, usuario) => dispatch(requestReporte(solicitud, usuario))
 })
 
 export default connect(mapStateToProps, mapDispatchToProps)(PaginaDetalle)

@@ -22,8 +22,6 @@ const navegarSiguiente = (self, requeridos) => {
 
   if (validateNext(requeridos)) {
     self.props.navigation.dispatch(pushAction)
-  } else {
-    console.log('no pasar')
   }
 }
 

@@ -33,12 +33,10 @@ const makePicker = (onChange, dato, current) => (
 const validateNext = none(either(isNil, isEmpty))
 const navigateNext = (self, requeridos) => {
   if (validateNext(requeridos)) {
-  const pushAction = StackActions.push({
-    routeName: 'ConfirmarSolicitud'
-  })
-  self.props.navigation.dispatch(pushAction)
-  } else {
-    console.log('no pasar')
+    const pushAction = StackActions.push({
+      routeName: 'ConfirmarSolicitud'
+    })
+    self.props.navigation.dispatch(pushAction)
   }
 }
 

@@ -7,9 +7,6 @@ import { connect } from 'react-redux'
 import { NavigationActions, StackActions } from 'react-navigation'
 import { all, not, identity } from 'ramda'
 
-
-import { AUTH_TOKEN, CLIENT_SECRET } from '../../constants'
-
 import DefaultIndicator from '../../components/DefaultIndicator'
 
 import { inicializarDatos } from '../../redux/actions/inicio'
@@ -34,7 +31,7 @@ const goToUserDetails = StackActions.reset({
 class Splash extends Component {
 
   componentWillMount() {
-    this.props.inicializarDatos(AUTH_TOKEN, CLIENT_SECRET)
+    this.props.inicializarDatos()
   }
 
 
@@ -81,7 +78,7 @@ const mapStateToProps = (state) => ({
 })
 
 const mapDispatchToProps = (dispatch) => ({
-  inicializarDatos: (token, secret) => dispatch(inicializarDatos(token, secret)),
+  inicializarDatos: () => dispatch(inicializarDatos()),
 })
 
 export default connect(mapStateToProps, mapDispatchToProps)(Splash)

@@ -1258,12 +1258,14 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -1278,17 +1280,20 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -1405,7 +1410,8 @@
         "inherits": {
           "version": "2.0.3",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "ini": {
           "version": "1.3.5",
@@ -1417,6 +1423,7 @@
           "version": "1.0.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -1431,6 +1438,7 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -1438,12 +1446,14 @@
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "minipass": {
           "version": "2.2.4",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.1",
             "yallist": "^3.0.0"
@@ -1462,6 +1472,7 @@
           "version": "0.5.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -1542,7 +1553,8 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -1554,6 +1566,7 @@
           "version": "1.4.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -1675,6 +1688,7 @@
           "version": "1.0.2",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",

+<!doctype html>
+<html class="no-js" lang="">
+
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="x-ua-compatible" content="ie=edge">
+  <title></title>
+  <meta name="description" content="">
+  <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+
+</head>
+
+<body>
+  <p>Hello world! This is HTML5 Boilerplate.</p>
+</body>
+
+</html>

-body {
-  padding: 50px;
-  font: 14px "Lucida Grande", Helvetica, Arial, sans-serif;
-}
-
-a {
-  color: #00B7FF;
-}

-hola mundo