send beneficiary to agency

src/contexts/AppContext.js

@@ -7,7 +7,9 @@ import APP_ACTIONS from '../actions/appActions';
 
 const initialState = {
  aidConnectId:null,
- isActive:false
+ isActive:false,
+ projectName:'',
+ projectId:''
 };
 
 export const AppContext = createContext(initialState);
@@ -16,17 +18,24 @@ const [state, dispatch] = useReducer(appReduce, initialState);
 
 const checkAidConnectId = useCallback(async (_aidConnectId) => {
  const {data} = await Service.checkAidConnectId(_aidConnectId);
- dispatch({ type: APP_ACTIONS.SET_AID_CONNECT_ID, data: {aidConnectId:data.id,isActive:data.isActive} });
+ dispatch({ type: APP_ACTIONS.SET_AID_CONNECT_ID, 
+ data: {aidConnectId:data.id,isActive:data.isActive,projectName:data.projectName,projectId:data.projectId} });
 },[])
 
+const sendBeneficiaries = async(beneficiaries) => {
+ const data = await Service.sendBeneficiaries(state.aidConnectId,beneficiaries);
+ return data;
+}
+
 
 
  return (
  <AppContext.Provider
  value={
  {
  ...state,
- checkAidConnectId
+ checkAidConnectId,
+ sendBeneficiaries
  }
  }
  >

src/contexts/registerBeneficiaryContext.js

@@ -6,7 +6,7 @@ import BENEFICIARY_ACTIONS from '../actions/beneficiaryActions';
 const initialState = {
  name: '',
  phone: '',
- gender: '',
+ gender: 'U',
  dob: '',
  agency: '',
  email: '',

src/modules/beneficiary/preview.js

@@ -13,7 +13,7 @@ import {AppContext} from '../../contexts/AppContext'
 export default function Preview() {
  const history = useHistory();
  const {aidConnectId} = useContext(AppContext);
- const { name, phone, address, gender, photo, govt_id_image, resetBeneficiary } =
+ const { name, phone, address, gender, photo,email,govt_id, govt_id_image, resetBeneficiary } =
  useContext(RegisterBeneficiaryContext);
 
  const handleRegister = async event => {
@@ -22,9 +22,13 @@ export default function Preview() {
  name,
  phone,
  address,
+ email: email || '',
+ gender,
+ govt_id: govt_id || '',
  photo,
  govt_id_image,
- createdAt: Date.now()
+ createdAt: Date.now(),
+ shared:false
  });
  resetBeneficiary();
  history.push(`/${aidConnectId}`);

src/modules/beneficiary/register.js

@@ -141,7 +141,7 @@ const AddBeneficiary = () => {
  className="form-control"
  name="address_temporary"
  placeholder="Enter temporary address"
- value={address_temporary}
+ value={address_temporary ? address_temporary : ''}
  onChange={updateBeneficiaryData}
  />
  <i className="clear-input">
@@ -170,7 +170,7 @@ const AddBeneficiary = () => {
  <label className="label" htmlFor="gender">
  Gender
  </label>
- <select className="form-control custom-select" id="gender">
+ <select className="form-control custom-select" name="gender" onChange={updateBeneficiaryData}>
  <option value="U">Select gender</option>
  <option value="M">Male</option>
  <option value="F">Female</option>

src/modules/beneficiary/share.js

@@ -1,17 +1,18 @@
 import React, { useState, useEffect, useCallback ,useContext} from 'react';
 import { Link } from 'react-router-dom';
+import Swal from 'sweetalert2';
 import AppHeader from '../layouts/AppHeader';
 import { IoHomeOutline, IoEye } from 'react-icons/io5';
 import { Button } from 'react-bootstrap';
-// import { useHistory } from 'react-router-dom';
+import { useHistory } from 'react-router-dom';
 import DataService from '../../services/db';
 import {AppContext} from '../../contexts/AppContext';
 import Info from '../global/Info';
 
 
 const BeneficiaryList = () => {
- // const history = useHistory();
- const {aidConnectId,isActive} = useContext(AppContext);
+  const history = useHistory();
+ const {aidConnectId,isActive,sendBeneficiaries} = useContext(AppContext);
  const [beneficiary, setBeneficiary] = useState([]);
  const [selectAll, setSelectAll] = useState(false);
  const [selectedBeneficiary, setSelectedBeneficiary] = useState([]);
@@ -40,7 +41,33 @@ const BeneficiaryList = () => {
  } else setSelectedBeneficiary([...selectedBeneficiary, phone]);
  };
 
- const handleShare = () => {};
+ const filterSharedBeneficiary = beneficiaries => {
+ const unSharedBeneficiary = beneficiaries.filter((el) => !el.shared);
+ return unSharedBeneficiary.map((el)=>{
+ const {shared,...rest} = el;
+ return rest
+ })
+ }
+
+ const handleShare = async () => {
+ if(!selectedBeneficiary.length) return Swal.fire('Error', 'Beneficiary Not Selected', 'warning');
+ const beneficiaries = await Promise.all(selectedBeneficiary.map(async (el)=>{
+ const {name,phone,address,email,gender,govt_id,shared} = await DataService.getBeneficiary(el);
+ return {name,phone,address,email,gender,govt_id,shared}
+ }))
+ const filteredBen = filterSharedBeneficiary(beneficiaries);
+ if(!filteredBen.length) return Swal.fire('Error', 'Selected Beneficiaries Already Shared', 'warning');
+
+ const d= await sendBeneficiaries(filteredBen);
+ if(d && d.inserted){
+ await Promise.all(selectedBeneficiary.map(async (el)=>{
+ await DataService.updateBeneficiary(el,{shared:true})
+ }))
+ await Swal.fire('Success',`Selected Beneficiaries Shared to Agency`,'success')
+ return history.push(`/${aidConnectId}`)
+ }
+ Swal.fire('Error',`Something Went Workng! Contact Admin`,'error')
+ };
 
  useEffect(() => {
  getAllBeneficiary();

src/modules/home/main.js

@@ -6,7 +6,7 @@ import {AppContext} from '../../contexts/AppContext';
 
 export default function Main() {
  const [totalBen, setTotalBen] = useState(0);
- const {aidConnectId} = useContext(AppContext);
+ const {aidConnectId,projectName} = useContext(AppContext);
  const getTotalBeneficiary = useCallback(async () => {
  const beneficiaries = await DataService.listBeneficiaries();
  setTotalBen(beneficiaries.length);
@@ -22,7 +22,7 @@ export default function Main() {
  <div className="section wallet-card-section pt-2">
  <div className="wallet-card">
  <div className="balance">
- <h3 className="title">Wash Programme</h3>
+ <h3 className="title">{projectName}</h3>
  </div>
  <div className="balance mt-2">
  <div className="left">

src/reducers/appReducer.js

@@ -6,7 +6,9 @@ const AppReducer = (state, action) => {
  return {
  ...state,
  aidConnectId: action.data.aidConnectId,
- isActive: action.data.isActive
+ isActive: action.data.isActive,
+ projectName: action.data.projectName,
+ projectId: action.data.projectId
  };
 
  case APP_ACTIONS.SET_AID_CONNECT_STATUS:

src/reducers/beneficiaryReducer.js

@@ -12,6 +12,7 @@ const AppReducer = (state, action) => {
  agency: action.data.agency,
  email: action.data.email,
  address: action.data.address,
+ address_temporary: action.data.address_temporary,
  govt_id: action.data.govt_id,
  project: action.data.project,
  extras: {

src/services/db.js

@@ -4,7 +4,7 @@ import { DB } from '../constants';
 const db = new Dexie(DB.NAME);
 
 db.version(DB.VERSION).stores({
- beneficiaries: 'phone,name,address,createdAt,photo,govt_id_image',
+ beneficiaries: 'phone,name,address,email,gender,govt_id,createdAt,photo,govt_id_image,shared',
  agencies:
  'address,name,api,network,rahatAddress,tokenAddress,erc20Address,erc1155Address,adminAddress,phone,email,logo,isApproved',
  projects: 'id,name',
@@ -73,6 +73,10 @@ const DataService = {
  return db.beneficiaries.get({ type }).orderBy('createdAt').reverse();
  },
 
+ async updateBeneficiary(key, data) {
+ return db.beneficiaries.update(key, data);
+ },
+
 };
 
 export default DataService;

src/services/index.js

@@ -3,12 +3,27 @@ import axios from 'axios';
 import API from '../constants/api';
 
 
-export async function checkAidConnectId(id) {
+export async function checkAidConnectId(aidConnectId) {
  try {
- if (!id) throw new Error('Must send id');
- const {data} = await axios.get(`${API.AID_CONNECT}/${id}`);
+ if (!aidConnectId) throw new Error('Must send aidConnectId');
+ const {data} = await axios.get(`${API.AID_CONNECT}/${aidConnectId}`);
  return data;
  } catch (e) {
  throw Error(e);
  }
 }
+
+export async function sendBeneficiaries(aidConnectId,payload) {
+ try {
+ if (!aidConnectId) throw new Error('Must send aidConnectId');
+ const {data} = await axios({
+ url:`${API.AID_CONNECT}/${aidConnectId}/beneficiaries`,
+ method: 'post',
+ data: payload
+ });
+ return data;
+ } catch (e) {
+ console.log(e)
+ throw Error(e);
+ }
+}