added all apis to redux

Author: yash-rajpal

VITask Android/.gitignore

@@ -62,4 +62,7 @@ buck-out/
 check.js
 timetableapi.json
 classesapi.json
-authenticate.json
+authenticate.json
+acadhistory.json
+marks.json
+moodleapi.json

VITask Android/actions/actions.js

@@ -15,6 +15,16 @@ import {
     FETCH_MARKS_REQUEST,
     FETCH_MARKS_SUCCESS,
     FETCH_MARKS_ERROR,
+
+    FETCH_MOODLE_ASSIGNMENTS_REQUEST,
+    FETCH_MOODLE_ASSIGNMENTS_SUCCESS,
+    FETCH_MOODLE_ASSIGNMENTS_ERROR,
+    FETCH_MOODLE_ASSIGNMENTS_SYNC,
+
+    FETCH_ACADHISTORY_REQUEST,
+    FETCH_ACADHISTORY_SUCCESS,
+    FETCH_ACADHISTORY_ERROR,
+
     } from './types'
 
 
@@ -93,7 +103,47 @@ import {
 
     const fetchMarksError = (err)=>{
         return{
-            type : FETCH_MARKS_SUCCESS,
+            type : FETCH_MARKS_ERROR,
+            error : err
+        }
+    }
+
+    const fetchMoodleAssignmentsRequest = ()=>{
+        return{
+            type : FETCH_MOODLE_ASSIGNMENTS_REQUEST
+        }
+    }
+
+    const fetchMoodleAssignmentsSuccess = (assignments) =>{
+        return{
+            type : FETCH_MOODLE_ASSIGNMENTS_SUCCESS,
+            data : assignments
+        }
+    }
+
+    const fetchMoodleAssignmentsError = (err) =>{
+        return{
+            type : FETCH_MOODLE_ASSIGNMENTS_ERROR,
+            error : err
+        }
+    }
+
+    const fetchAcadHistoryRequest = () =>{
+        return{
+            type : FETCH_ACADHISTORY_REQUEST
+        }
+    }
+
+    const fetchAcadHistorySuccess = (acadHistory) =>{
+        return{
+            type : FETCH_ACADHISTORY_SUCCESS,
+            data : acadHistory
+        }
+    }
+
+    const fetchAcadHistoryError = (err) =>{
+        return{
+            type : FETCH_ATTENDANCE_ERROR,
             error : err
         }
     }
@@ -108,6 +158,8 @@ import {
     const ORIGINAL_ATTENDANCE = `https://vitask.me/classesapi?token={state.reducer.userInfo.APItoken}`
     const ORIGINAL_TIMETABLE = `https://vitask.me/timetableapi?token={state.reducer.userInfo.APItoken}`
     const ORIGINAL_MARKS = 'https://vitask.me/marksapi?token={state.reducer.userInfo.APItoken}'
+    const ORIGINAL_MOODLE = 'https://vitask.me/moodleapi?token={state.reducer.userInfo.APItoken}'
+    const ORIGINAL_ACADEMIC_HISTORY = "https://vitask.me/acadhistoryapi?token={state.reducer.userInfo.APItoken}"
 
     export const loginVTOP =(username, password) => {
         return dispatch=>{
@@ -171,4 +223,34 @@ import {
             })
             .catch(err=> dispatch(fetchMarksError(err)))
         }
+    }
+
+    export const fetchMoodleAssignments = ()=>{
+        return (dispatch, getState)=>{
+            const state = getState()
+            dispatch(fetchMoodleAssignmentsRequest)
+            fetch('https://jsonplaceholder.typicode.com/posts')
+            .then(res =>{
+                res = require('../moodleapi.json')
+                return res
+            }).then(res =>{
+                dispatch(fetchMoodleAssignmentsSuccess(res))
+            })
+            .catch(err => dispatch(fetchMoodleAssignmentsError(err)))
+        }
+    }
+
+    export const fetchAcadHistory = () =>{
+        return(dispatch,getState) =>{
+            const state = getState()
+            dispatch(fetchAcadHistoryRequest)
+            fetch('https://jsonplaceholder.typicode.com/posts')
+            .then(res =>{
+                res = require('../acadhistory.json')
+                return res
+            }).then(res =>{
+                dispatch(fetchAcadHistorySuccess(res))
+            })
+            .catch(err =>{dispatch((fetchAcadHistoryError(err)))})
+        }
     }

VITask Android/actions/types.js

@@ -21,6 +21,15 @@ export const FETCH_MARKS_SUCCESS = "FETCH_MARKS_SUCCESS"
 export const FETCH_MARKS_ERROR = "FETCH_MARKS_ERROR"
 export const SYNC_MARKS = "SYNC_MARKS"
 
+export const FETCH_MOODLE_ASSIGNMENTS_REQUEST = "FETCH_MOODLE_ASSIGNMENTS"
+export const FETCH_MOODLE_ASSIGNMENTS_SUCCESS = "FETCH_MOODLE_ASSIGNMENTS_SUCCESS"
+export const FETCH_MOODLE_ASSIGNMENTS_ERROR = "FETCH_MOODLE_ASSIGNMENTS_ERROR"
+export const FETCH_MOODLE_ASSIGNMENTS_SYNC = "FETCH_MOODLE_ASSIGNMENTS_SYNC"
+
+export const FETCH_ACADHISTORY_REQUEST = "FETCH_ACADHISTORY_REQUEST"
+export const FETCH_ACADHISTORY_SUCCESS = "FETCH_ACADHISTORY_SUCCESS"
+export const FETCH_ACADHISTORY_ERROR = "FETCH_ACADHISTORY_SUCCESS"
+
 
 // These are only for using developement purpose to save api calls, instead api calls are done to dummy server
 export const DEV_LOAD_ATTENDANCE = "DEV_LOAD_ATTENDANCE"

VITask Android/android/.gradle/buildOutputCleanup/buildOutputCleanup.lock

@@ -11,10 +11,18 @@ import {
     FETCH_TIMETABLE_SUCCESS,
     FETCH_TIMETABLE_ERROR,
 
-    REFORMAT_DATA,
     FETCH_MARKS_SUCCESS,
     FETCH_MARKS_REQUEST,
-    FETCH_MARKS_ERROR
+    FETCH_MARKS_ERROR,
+
+    FETCH_MOODLE_ASSIGNMENTS_REQUEST,
+    FETCH_MOODLE_ASSIGNMENTS_SUCCESS,
+    FETCH_MOODLE_ASSIGNMENTS_ERROR,
+    FETCH_MOODLE_ASSIGNMENTS_SYNC,
+
+    REFORMAT_DATA,
+    FETCH_ACADHISTORY_REQUEST,
+    FETCH_ACADHISTORY_SUCCESS,
     } from '../actions/types'
 import { createStore, applyMiddleware, combineReducers } from "redux";
 import thunkMiddleware from 'redux-thunk'
@@ -167,14 +175,14 @@ const reducer = (state = initialState, action)=>{
         case FETCH_TIMETABLE_ERROR:
             return {
                 ...state,
-                status: "ERROR",
+                status : "ERROR",
                 error : action.error
             }
 
         case FETCH_MARKS_REQUEST:
             return{
                 ...state,
-                status:"REQUEST_MARKS",
+                status : "REQUEST_MARKS",
                 error : ""
             }
 
@@ -191,6 +199,48 @@ const reducer = (state = initialState, action)=>{
                 status : "ERROR",
                 error : action.error
             }
+        
+        case FETCH_MOODLE_ASSIGNMENTS_REQUEST:
+            return{
+                ...state,
+                status : "REQUEST_MOODLE_ASSIGNMENTS",
+                error : ""
+            }
+
+        case FETCH_MOODLE_ASSIGNMENTS_SUCCESS:
+            return{
+                ...state,
+                status : "MOODLE_ASSIGNMENTS_COMPLETE",
+                assignments : action.data
+            }
+
+        case FETCH_MOODLE_ASSIGNMENTS_ERROR:
+            return{
+                ...state,
+                staus : "ERROR",
+                error : action.error
+            }
+
+        case FETCH_ACADHISTORY_REQUEST:
+            return{
+                ...state,
+                status : "REQUEST_ACADHISTORY",
+                error : ""
+            }
+
+        case FETCH_ACADHISTORY_SUCCESS:
+            return{
+                ...state,
+                status : "ACADHISTORY_COMPLETE",
+                acadhistory : action.data
+            }
+
+        case FETCH_ATTENDANCE_ERROR:
+            return{
+                ...state,
+                status : "ERROR",
+                error : action.error
+            }
 
         case REFORMAT_DATA:
             // This will be called only once and reformate the api

VITask Android/reducer/reducer.js

@@ -19,7 +19,7 @@ class DashboardScreen extends Component {
 
     componentDidMount(){
         console.log(Object.keys(this.props))
-        console.log(this.props.state.marks)
+        console.log(this.props.state.acadhistory)
         let totalClass = 0
         let totalLab = 0
         for(classes of this.state.timetable){

VITask Android/screens/DashboardScreen.js

@@ -8,7 +8,9 @@ import {
     fetchAttendance,
     fetchTimetable,
     reformatData,
-    fetchMarks
+    fetchMarks,
+    fetchMoodleAssignments,
+    fetchAcadHistory
 } from '../actions/actions'
 
 class LoadingScreen extends Component {
@@ -70,6 +72,8 @@ class LoadingScreen extends Component {
                 // Timetable complete, call the attendance api
                 this.props.getAttendance()
                 this.props.getMarks()
+                this.props.getMoodle()
+                this.props.getAcadHistory()
                 this.setState({
                     text:"And before we forget...",
                     process: "Getting your Attendance"
@@ -185,6 +189,12 @@ const mapDispatchToProps = (dispatch) => {
       getMarks:()=>{
         dispatch(fetchMarks())
       },
+      getMoodle:()=>{
+        dispatch(fetchMoodleAssignments())
+      },
+      getAcadHistory:()=>{
+          dispatch(fetchAcadHistory())
+      },
       reformat: ()=>{
           dispatch(reformatData())
       }