Rename patient to beneficiary throughout the app

- Replace all 'patient' terminology with 'beneficiary'
- Add Voice AI screen (voice.tsx) with voice_ask API integration
- Optimize getAllBeneficiaries() to use single deployments_list API call
- Rename PatientDashboardData to BeneficiaryDashboardData
- Update UI components: BeneficiaryCard, beneficiary picker modal
- Update all error messages and comments

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
Sergei 2025-12-19 12:57:48 -08:00
parent 12cdab8fad
commit 19d24e7b00
7 changed files with 744 additions and 96 deletions

View File

@ -9,7 +9,7 @@ import { useBeneficiary } from '@/contexts/BeneficiaryContext';
import { AppColors, BorderRadius, FontSizes, Spacing } from '@/constants/theme'; import { AppColors, BorderRadius, FontSizes, Spacing } from '@/constants/theme';
import { FullScreenError } from '@/components/ui/ErrorMessage'; import { FullScreenError } from '@/components/ui/ErrorMessage';
// Dashboard URL with patient ID // Dashboard URL with beneficiary ID (deployment_id)
const getDashboardUrl = (deploymentId: string) => const getDashboardUrl = (deploymentId: string) =>
`https://react.eluxnetworks.net/dashboard/${deploymentId}`; `https://react.eluxnetworks.net/dashboard/${deploymentId}`;
@ -25,7 +25,7 @@ export default function BeneficiaryDashboardScreen() {
const [userId, setUserId] = useState<string | null>(null); const [userId, setUserId] = useState<string | null>(null);
const [isTokenLoaded, setIsTokenLoaded] = useState(false); const [isTokenLoaded, setIsTokenLoaded] = useState(false);
// Build dashboard URL with patient ID // Build dashboard URL with beneficiary ID
const dashboardUrl = id ? getDashboardUrl(id) : 'https://react.eluxnetworks.net/dashboard'; const dashboardUrl = id ? getDashboardUrl(id) : 'https://react.eluxnetworks.net/dashboard';
const beneficiaryName = currentBeneficiary?.name || 'Dashboard'; const beneficiaryName = currentBeneficiary?.name || 'Dashboard';

View File

@ -47,8 +47,8 @@ export default function ChatScreen() {
// Security: require beneficiary to be selected // Security: require beneficiary to be selected
if (!currentBeneficiary?.id) { if (!currentBeneficiary?.id) {
Alert.alert( Alert.alert(
'Select Patient', 'Select Beneficiary',
'Please select a patient from the Patients tab before starting a conversation.', 'Please select a beneficiary from the Dashboard tab before starting a conversation.',
[{ text: 'OK' }] [{ text: 'OK' }]
); );
return; return;

View File

@ -18,16 +18,16 @@ import { api } from '@/services/api';
import { AppColors, BorderRadius, FontSizes, Spacing } from '@/constants/theme'; import { AppColors, BorderRadius, FontSizes, Spacing } from '@/constants/theme';
import type { Beneficiary } from '@/types'; import type { Beneficiary } from '@/types';
// Patient card component // Beneficiary card component
interface PatientCardProps { interface BeneficiaryCardProps {
patient: Beneficiary; beneficiary: Beneficiary;
onPress: () => void; onPress: () => void;
} }
function PatientCard({ patient, onPress }: PatientCardProps) { function BeneficiaryCard({ beneficiary, onPress }: BeneficiaryCardProps) {
const wellnessColor = patient.wellness_score && patient.wellness_score >= 70 const wellnessColor = beneficiary.wellness_score && beneficiary.wellness_score >= 70
? AppColors.success ? AppColors.success
: patient.wellness_score && patient.wellness_score >= 40 : beneficiary.wellness_score && beneficiary.wellness_score >= 40
? '#F59E0B' ? '#F59E0B'
: AppColors.error; : AppColors.error;
@ -36,12 +36,12 @@ function PatientCard({ patient, onPress }: PatientCardProps) {
<View style={styles.cardContent}> <View style={styles.cardContent}>
{/* Avatar */} {/* Avatar */}
<View style={styles.avatarWrapper}> <View style={styles.avatarWrapper}>
{patient.avatar ? ( {beneficiary.avatar ? (
<Image source={{ uri: patient.avatar }} style={styles.avatarImage} /> <Image source={{ uri: beneficiary.avatar }} style={styles.avatarImage} />
) : ( ) : (
<View style={styles.avatar}> <View style={styles.avatar}>
<Text style={styles.avatarText}> <Text style={styles.avatarText}>
{patient.name.charAt(0).toUpperCase()} {beneficiary.name.charAt(0).toUpperCase()}
</Text> </Text>
</View> </View>
)} )}
@ -49,23 +49,23 @@ function PatientCard({ patient, onPress }: PatientCardProps) {
{/* Info */} {/* Info */}
<View style={styles.info}> <View style={styles.info}>
<Text style={styles.name}>{patient.name}</Text> <Text style={styles.name}>{beneficiary.name}</Text>
{patient.last_location && ( {beneficiary.last_location && (
<View style={styles.locationRow}> <View style={styles.locationRow}>
<Ionicons name="location-outline" size={12} color={AppColors.textSecondary} /> <Ionicons name="location-outline" size={12} color={AppColors.textSecondary} />
<Text style={styles.locationText}>{patient.last_location}</Text> <Text style={styles.locationText}>{beneficiary.last_location}</Text>
</View> </View>
)} )}
{patient.last_activity && ( {beneficiary.last_activity && (
<Text style={styles.lastActivity}>{patient.last_activity}</Text> <Text style={styles.lastActivity}>{beneficiary.last_activity}</Text>
)} )}
</View> </View>
{/* Wellness Score */} {/* Wellness Score */}
{patient.wellness_score !== undefined && ( {beneficiary.wellness_score !== undefined && (
<View style={styles.wellnessContainer}> <View style={styles.wellnessContainer}>
<Text style={[styles.wellnessScore, { color: wellnessColor }]}> <Text style={[styles.wellnessScore, { color: wellnessColor }]}>
{patient.wellness_score}% {beneficiary.wellness_score}%
</Text> </Text>
<Text style={styles.wellnessLabel}>Wellness</Text> <Text style={styles.wellnessLabel}>Wellness</Text>
</View> </View>
@ -83,31 +83,31 @@ export default function HomeScreen() {
const { currentBeneficiary, setCurrentBeneficiary } = useBeneficiary(); const { currentBeneficiary, setCurrentBeneficiary } = useBeneficiary();
const [isLoading, setIsLoading] = useState(true); const [isLoading, setIsLoading] = useState(true);
const [isRefreshing, setIsRefreshing] = useState(false); const [isRefreshing, setIsRefreshing] = useState(false);
const [patients, setPatients] = useState<Beneficiary[]>([]); const [beneficiaries, setBeneficiaries] = useState<Beneficiary[]>([]);
const [error, setError] = useState<string | null>(null); const [error, setError] = useState<string | null>(null);
// Load patients from API // Load beneficiaries from API
useEffect(() => { useEffect(() => {
loadPatients(); loadBeneficiaries();
}, []); }, []);
const loadPatients = async () => { const loadBeneficiaries = async () => {
setIsLoading(true); setIsLoading(true);
setError(null); setError(null);
try { try {
const response = await api.getAllPatients(); const response = await api.getAllBeneficiaries();
if (response.ok && response.data) { if (response.ok && response.data) {
setPatients(response.data); setBeneficiaries(response.data);
// Auto-select first beneficiary if none selected // Auto-select first beneficiary if none selected
if (!currentBeneficiary && response.data.length > 0) { if (!currentBeneficiary && response.data.length > 0) {
setCurrentBeneficiary(response.data[0]); setCurrentBeneficiary(response.data[0]);
} }
} else { } else {
setError(response.error?.message || 'Failed to load patients'); setError(response.error?.message || 'Failed to load beneficiaries');
} }
} catch (err) { } catch (err) {
console.error('Failed to load patients:', err); console.error('Failed to load beneficiaries:', err);
setError('Failed to load patients'); setError('Failed to load beneficiaries');
} finally { } finally {
setIsLoading(false); setIsLoading(false);
} }
@ -115,15 +115,15 @@ export default function HomeScreen() {
const handleRefresh = async () => { const handleRefresh = async () => {
setIsRefreshing(true); setIsRefreshing(true);
await loadPatients(); await loadBeneficiaries();
setIsRefreshing(false); setIsRefreshing(false);
}; };
const handlePatientPress = (patient: Beneficiary) => { const handleBeneficiaryPress = (beneficiary: Beneficiary) => {
// Set current beneficiary in context // Set current beneficiary in context
setCurrentBeneficiary(patient); setCurrentBeneficiary(beneficiary);
// Navigate to patient dashboard with deployment_id // Navigate to beneficiary dashboard with deployment_id
router.push(`/(tabs)/beneficiaries/${patient.id}/dashboard`); router.push(`/(tabs)/beneficiaries/${beneficiary.id}/dashboard`);
}; };
if (isLoading) { if (isLoading) {
@ -137,7 +137,7 @@ export default function HomeScreen() {
</View> </View>
<View style={styles.loadingContainer}> <View style={styles.loadingContainer}>
<ActivityIndicator size="large" color={AppColors.primary} /> <ActivityIndicator size="large" color={AppColors.primary} />
<Text style={styles.loadingText}>Loading patients...</Text> <Text style={styles.loadingText}>Loading beneficiaries...</Text>
</View> </View>
</SafeAreaView> </SafeAreaView>
); );
@ -156,21 +156,21 @@ export default function HomeScreen() {
</TouchableOpacity> </TouchableOpacity>
</View> </View>
{/* Patient List */} {/* Beneficiary List */}
{patients.length === 0 ? ( {beneficiaries.length === 0 ? (
<View style={styles.emptyContainer}> <View style={styles.emptyContainer}>
<Ionicons name="people-outline" size={64} color={AppColors.textMuted} /> <Ionicons name="people-outline" size={64} color={AppColors.textMuted} />
<Text style={styles.emptyTitle}>No Patients</Text> <Text style={styles.emptyTitle}>No Beneficiaries</Text>
<Text style={styles.emptyText}>You don't have any patients assigned yet.</Text> <Text style={styles.emptyText}>You don't have any beneficiaries assigned yet.</Text>
</View> </View>
) : ( ) : (
<FlatList <FlatList
data={patients} data={beneficiaries}
keyExtractor={(item) => item.id.toString()} keyExtractor={(item) => item.id.toString()}
renderItem={({ item }) => ( renderItem={({ item }) => (
<PatientCard <BeneficiaryCard
patient={item} beneficiary={item}
onPress={() => handlePatientPress(item)} onPress={() => handleBeneficiaryPress(item)}
/> />
)} )}
contentContainerStyle={styles.listContent} contentContainerStyle={styles.listContent}

661
app/(tabs)/voice.tsx Normal file
View File

@ -0,0 +1,661 @@
import React, { useState, useCallback, useRef, useEffect } from 'react';
import {
View,
Text,
StyleSheet,
FlatList,
TextInput,
TouchableOpacity,
KeyboardAvoidingView,
Platform,
Alert,
ActivityIndicator,
Modal,
ScrollView,
Animated,
} from 'react-native';
import { Ionicons, Feather } from '@expo/vector-icons';
import { SafeAreaView } from 'react-native-safe-area-context';
import * as SecureStore from 'expo-secure-store';
import { Audio } from 'expo-av';
import { useBeneficiary } from '@/contexts/BeneficiaryContext';
import { api } from '@/services/api';
import { AppColors, BorderRadius, FontSizes, Spacing } from '@/constants/theme';
import type { Message, Beneficiary } from '@/types';
const OLD_API_URL = 'https://eluxnetworks.net/function/well-api/api';
interface VoiceAskResponse {
ok: boolean;
response: {
Command: string;
body: string;
name?: string;
reflected?: string;
language?: string;
time?: number;
};
status: string;
}
export default function VoiceAIScreen() {
const { currentBeneficiary, setCurrentBeneficiary } = useBeneficiary();
const [messages, setMessages] = useState<Message[]>([
{
id: '1',
role: 'assistant',
content: 'Hello! I\'m your voice assistant for monitoring your loved ones. Select a beneficiary and ask me anything about their wellbeing. You can type or tap the microphone to speak.',
timestamp: new Date(),
},
]);
const [input, setInput] = useState('');
const [isSending, setIsSending] = useState(false);
const [isRecording, setIsRecording] = useState(false);
const [showBeneficiaryPicker, setShowBeneficiaryPicker] = useState(false);
const [beneficiaries, setBeneficiaries] = useState<Beneficiary[]>([]);
const flatListRef = useRef<FlatList>(null);
const lastSendTimeRef = useRef<number>(0);
const recordingRef = useRef<Audio.Recording | null>(null);
const pulseAnim = useRef(new Animated.Value(1)).current;
const SEND_COOLDOWN_MS = 1000;
// Load beneficiaries on mount
useEffect(() => {
loadBeneficiaries();
setupAudio();
return () => {
if (recordingRef.current) {
recordingRef.current.stopAndUnloadAsync();
}
};
}, []);
const setupAudio = async () => {
try {
await Audio.requestPermissionsAsync();
await Audio.setAudioModeAsync({
allowsRecordingIOS: true,
playsInSilentModeIOS: true,
});
} catch (error) {
console.log('Audio setup error:', error);
}
};
const loadBeneficiaries = async () => {
const response = await api.getAllBeneficiaries();
if (response.ok && response.data) {
setBeneficiaries(response.data);
}
};
// Pulse animation for recording
useEffect(() => {
if (isRecording) {
const pulse = Animated.loop(
Animated.sequence([
Animated.timing(pulseAnim, {
toValue: 1.3,
duration: 500,
useNativeDriver: true,
}),
Animated.timing(pulseAnim, {
toValue: 1,
duration: 500,
useNativeDriver: true,
}),
])
);
pulse.start();
return () => pulse.stop();
}
}, [isRecording]);
const sendToVoiceAsk = async (question: string): Promise<string> => {
const token = await SecureStore.getItemAsync('accessToken');
const userName = await SecureStore.getItemAsync('userName');
if (!token || !userName) {
throw new Error('Please log in to use voice assistant');
}
if (!currentBeneficiary?.id) {
throw new Error('Please select a beneficiary first');
}
const response = await fetch(OLD_API_URL, {
method: 'POST',
headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
body: new URLSearchParams({
function: 'voice_ask',
clientId: '001',
user_name: userName,
token: token,
question: question,
deployment_id: currentBeneficiary.id.toString(),
}).toString(),
});
const data: VoiceAskResponse = await response.json();
if (data.ok && data.response?.body) {
return data.response.body;
} else if (data.status === '401 Unauthorized') {
throw new Error('Session expired. Please log in again.');
} else {
throw new Error('Could not get response from voice assistant');
}
};
const startRecording = async () => {
try {
const { status } = await Audio.requestPermissionsAsync();
if (status !== 'granted') {
Alert.alert('Permission Required', 'Please allow microphone access to use voice input.');
return;
}
await Audio.setAudioModeAsync({
allowsRecordingIOS: true,
playsInSilentModeIOS: true,
});
const { recording } = await Audio.Recording.createAsync(
Audio.RecordingOptionsPresets.HIGH_QUALITY
);
recordingRef.current = recording;
setIsRecording(true);
} catch (error) {
console.error('Failed to start recording:', error);
Alert.alert('Error', 'Could not start recording. Please try again.');
}
};
const stopRecording = async () => {
if (!recordingRef.current) return;
setIsRecording(false);
try {
await recordingRef.current.stopAndUnloadAsync();
const uri = recordingRef.current.getURI();
recordingRef.current = null;
if (uri) {
// For now, we'll show a message about speech-to-text
// In production, this would send to a speech-to-text service
Alert.alert(
'Voice Recorded',
'Speech-to-text conversion requires additional integration. For now, please type your question.',
[{ text: 'OK' }]
);
}
} catch (error) {
console.error('Failed to stop recording:', error);
}
};
const handleSend = useCallback(async () => {
const trimmedInput = input.trim();
if (!trimmedInput || isSending) return;
// Debounce
const now = Date.now();
if (now - lastSendTimeRef.current < SEND_COOLDOWN_MS) return;
lastSendTimeRef.current = now;
// Require beneficiary selection
if (!currentBeneficiary?.id) {
Alert.alert(
'Select Beneficiary',
'Please select a beneficiary first to ask questions about their wellbeing.',
[{ text: 'Select', onPress: () => setShowBeneficiaryPicker(true) }, { text: 'Cancel' }]
);
return;
}
const userMessage: Message = {
id: Date.now().toString(),
role: 'user',
content: trimmedInput,
timestamp: new Date(),
};
setMessages(prev => [...prev, userMessage]);
setInput('');
setIsSending(true);
try {
const aiResponse = await sendToVoiceAsk(trimmedInput);
const assistantMessage: Message = {
id: (Date.now() + 1).toString(),
role: 'assistant',
content: aiResponse,
timestamp: new Date(),
};
setMessages(prev => [...prev, assistantMessage]);
} catch (error) {
const errorMessage: Message = {
id: (Date.now() + 1).toString(),
role: 'assistant',
content: `Sorry, I encountered an error: ${error instanceof Error ? error.message : 'Unknown error'}. Please try again.`,
timestamp: new Date(),
};
setMessages(prev => [...prev, errorMessage]);
} finally {
setIsSending(false);
}
}, [input, isSending, currentBeneficiary, messages]);
const selectBeneficiary = (beneficiary: Beneficiary) => {
setCurrentBeneficiary(beneficiary);
setShowBeneficiaryPicker(false);
// Add welcome message for selected beneficiary
const welcomeMessage: Message = {
id: Date.now().toString(),
role: 'assistant',
content: `Great! I'm now ready to answer questions about ${beneficiary.name}. ${beneficiary.wellness_descriptor ? `Current status: ${beneficiary.wellness_descriptor}.` : ''} Ask me anything!`,
timestamp: new Date(),
};
setMessages(prev => [...prev, welcomeMessage]);
};
const renderMessage = ({ item }: { item: Message }) => {
const isUser = item.role === 'user';
return (
<View style={[styles.messageContainer, isUser ? styles.userMessageContainer : styles.assistantMessageContainer]}>
{!isUser && (
<View style={styles.avatarContainer}>
<Feather name="mic" size={16} color={AppColors.white} />
</View>
)}
<View style={[styles.messageBubble, isUser ? styles.userBubble : styles.assistantBubble]}>
<Text style={[styles.messageText, isUser ? styles.userMessageText : styles.assistantMessageText]}>
{item.content}
</Text>
<Text style={[styles.timestamp, isUser && styles.userTimestamp]}>
{item.timestamp.toLocaleTimeString([], { hour: '2-digit', minute: '2-digit' })}
</Text>
</View>
</View>
);
};
return (
<SafeAreaView style={styles.container} edges={['top']}>
{/* Header */}
<View style={styles.header}>
<View style={styles.headerInfo}>
<View style={styles.headerAvatar}>
<Feather name="mic" size={20} color={AppColors.white} />
</View>
<View>
<Text style={styles.headerTitle}>Voice AI</Text>
<Text style={styles.headerSubtitle}>
{isSending
? 'Thinking...'
: currentBeneficiary
? `Monitoring ${currentBeneficiary.name}`
: 'Select a beneficiary'}
</Text>
</View>
</View>
<TouchableOpacity style={styles.beneficiaryButton} onPress={() => setShowBeneficiaryPicker(true)}>
<Feather name="users" size={20} color={AppColors.primary} />
<Text style={styles.beneficiaryButtonText}>
{currentBeneficiary?.name?.split(' ')[0] || 'Select'}
</Text>
</TouchableOpacity>
</View>
{/* Messages */}
<KeyboardAvoidingView
style={styles.chatContainer}
behavior={Platform.OS === 'ios' ? 'padding' : undefined}
keyboardVerticalOffset={Platform.OS === 'ios' ? 90 : 0}
>
<FlatList
ref={flatListRef}
data={messages}
keyExtractor={item => item.id}
renderItem={renderMessage}
contentContainerStyle={styles.messagesList}
showsVerticalScrollIndicator={false}
onContentSizeChange={() => flatListRef.current?.scrollToEnd({ animated: true })}
/>
{/* Recording indicator */}
{isRecording && (
<View style={styles.recordingIndicator}>
<Animated.View style={[styles.recordingDot, { transform: [{ scale: pulseAnim }] }]} />
<Text style={styles.recordingText}>Listening...</Text>
</View>
)}
{/* Input */}
<View style={styles.inputContainer}>
<TouchableOpacity
style={[styles.micButton, isRecording && styles.micButtonActive]}
onPressIn={startRecording}
onPressOut={stopRecording}
>
<Feather name="mic" size={22} color={isRecording ? AppColors.white : AppColors.primary} />
</TouchableOpacity>
<TextInput
style={styles.input}
placeholder="Ask about your loved one..."
placeholderTextColor={AppColors.textMuted}
value={input}
onChangeText={setInput}
multiline
maxLength={1000}
editable={!isSending && !isRecording}
onSubmitEditing={handleSend}
/>
<TouchableOpacity
style={[styles.sendButton, (!input.trim() || isSending) && styles.sendButtonDisabled]}
onPress={handleSend}
disabled={!input.trim() || isSending}
>
{isSending ? (
<ActivityIndicator size="small" color={AppColors.white} />
) : (
<Ionicons name="send" size={20} color={input.trim() ? AppColors.white : AppColors.textMuted} />
)}
</TouchableOpacity>
</View>
</KeyboardAvoidingView>
{/* Beneficiary Picker Modal */}
<Modal visible={showBeneficiaryPicker} animationType="slide" transparent>
<View style={styles.modalOverlay}>
<View style={styles.modalContent}>
<View style={styles.modalHeader}>
<Text style={styles.modalTitle}>Select Beneficiary</Text>
<TouchableOpacity onPress={() => setShowBeneficiaryPicker(false)}>
<Ionicons name="close" size={24} color={AppColors.textPrimary} />
</TouchableOpacity>
</View>
<ScrollView style={styles.beneficiaryList}>
{beneficiaries.length === 0 ? (
<View style={styles.emptyState}>
<ActivityIndicator size="large" color={AppColors.primary} />
<Text style={styles.emptyStateText}>Loading beneficiaries...</Text>
</View>
) : (
beneficiaries.map(beneficiary => (
<TouchableOpacity
key={beneficiary.id}
style={[
styles.beneficiaryItem,
currentBeneficiary?.id === beneficiary.id && styles.beneficiaryItemSelected,
]}
onPress={() => selectBeneficiary(beneficiary)}
>
<View style={styles.beneficiaryInfo}>
<Text style={styles.beneficiaryName}>{beneficiary.name}</Text>
<Text style={styles.beneficiaryStatus}>
{beneficiary.wellness_descriptor || beneficiary.last_location || 'No data'}
</Text>
</View>
<View style={[styles.statusDot, { backgroundColor: beneficiary.status === 'online' ? AppColors.success : AppColors.offline }]} />
</TouchableOpacity>
))
)}
</ScrollView>
</View>
</View>
</Modal>
</SafeAreaView>
);
}
const styles = StyleSheet.create({
container: {
flex: 1,
backgroundColor: AppColors.surface,
},
header: {
flexDirection: 'row',
alignItems: 'center',
justifyContent: 'space-between',
paddingHorizontal: Spacing.md,
paddingVertical: Spacing.sm,
backgroundColor: AppColors.background,
borderBottomWidth: 1,
borderBottomColor: AppColors.border,
},
headerInfo: {
flexDirection: 'row',
alignItems: 'center',
},
headerAvatar: {
width: 40,
height: 40,
borderRadius: BorderRadius.full,
backgroundColor: '#9B59B6', // Purple for Voice AI
justifyContent: 'center',
alignItems: 'center',
marginRight: Spacing.sm,
},
headerTitle: {
fontSize: FontSizes.lg,
fontWeight: '600',
color: AppColors.textPrimary,
},
headerSubtitle: {
fontSize: FontSizes.sm,
color: AppColors.success,
},
beneficiaryButton: {
flexDirection: 'row',
alignItems: 'center',
paddingHorizontal: Spacing.sm,
paddingVertical: Spacing.xs,
backgroundColor: AppColors.surface,
borderRadius: BorderRadius.lg,
borderWidth: 1,
borderColor: AppColors.border,
},
beneficiaryButtonText: {
marginLeft: Spacing.xs,
fontSize: FontSizes.sm,
color: AppColors.primary,
fontWeight: '500',
},
chatContainer: {
flex: 1,
},
messagesList: {
padding: Spacing.md,
paddingBottom: Spacing.lg,
},
messageContainer: {
flexDirection: 'row',
marginBottom: Spacing.md,
alignItems: 'flex-end',
},
userMessageContainer: {
justifyContent: 'flex-end',
},
assistantMessageContainer: {
justifyContent: 'flex-start',
},
avatarContainer: {
width: 32,
height: 32,
borderRadius: BorderRadius.full,
backgroundColor: '#9B59B6',
justifyContent: 'center',
alignItems: 'center',
marginRight: Spacing.xs,
},
messageBubble: {
maxWidth: '75%',
padding: Spacing.sm + 4,
borderRadius: BorderRadius.lg,
},
userBubble: {
backgroundColor: AppColors.primary,
borderBottomRightRadius: BorderRadius.sm,
},
assistantBubble: {
backgroundColor: AppColors.background,
borderBottomLeftRadius: BorderRadius.sm,
},
messageText: {
fontSize: FontSizes.base,
lineHeight: 22,
},
userMessageText: {
color: AppColors.white,
},
assistantMessageText: {
color: AppColors.textPrimary,
},
timestamp: {
fontSize: FontSizes.xs,
color: AppColors.textMuted,
marginTop: Spacing.xs,
alignSelf: 'flex-end',
},
userTimestamp: {
color: 'rgba(255,255,255,0.7)',
},
recordingIndicator: {
flexDirection: 'row',
alignItems: 'center',
justifyContent: 'center',
paddingVertical: Spacing.sm,
backgroundColor: 'rgba(155, 89, 182, 0.1)',
},
recordingDot: {
width: 12,
height: 12,
borderRadius: 6,
backgroundColor: '#E74C3C',
marginRight: Spacing.sm,
},
recordingText: {
fontSize: FontSizes.sm,
color: '#9B59B6',
fontWeight: '500',
},
inputContainer: {
flexDirection: 'row',
alignItems: 'flex-end',
padding: Spacing.md,
backgroundColor: AppColors.background,
borderTopWidth: 1,
borderTopColor: AppColors.border,
},
micButton: {
width: 44,
height: 44,
borderRadius: BorderRadius.full,
backgroundColor: AppColors.surface,
justifyContent: 'center',
alignItems: 'center',
marginRight: Spacing.sm,
borderWidth: 1,
borderColor: AppColors.primary,
},
micButtonActive: {
backgroundColor: '#E74C3C',
borderColor: '#E74C3C',
},
input: {
flex: 1,
backgroundColor: AppColors.surface,
borderRadius: BorderRadius.xl,
paddingHorizontal: Spacing.md,
paddingVertical: Spacing.sm,
fontSize: FontSizes.base,
color: AppColors.textPrimary,
maxHeight: 100,
marginRight: Spacing.sm,
},
sendButton: {
width: 44,
height: 44,
borderRadius: BorderRadius.full,
backgroundColor: '#9B59B6',
justifyContent: 'center',
alignItems: 'center',
},
sendButtonDisabled: {
backgroundColor: AppColors.surface,
},
// Modal styles
modalOverlay: {
flex: 1,
backgroundColor: 'rgba(0,0,0,0.5)',
justifyContent: 'flex-end',
},
modalContent: {
backgroundColor: AppColors.background,
borderTopLeftRadius: BorderRadius.xl,
borderTopRightRadius: BorderRadius.xl,
maxHeight: '70%',
},
modalHeader: {
flexDirection: 'row',
alignItems: 'center',
justifyContent: 'space-between',
padding: Spacing.md,
borderBottomWidth: 1,
borderBottomColor: AppColors.border,
},
modalTitle: {
fontSize: FontSizes.lg,
fontWeight: '600',
color: AppColors.textPrimary,
},
beneficiaryList: {
padding: Spacing.md,
},
beneficiaryItem: {
flexDirection: 'row',
alignItems: 'center',
justifyContent: 'space-between',
padding: Spacing.md,
backgroundColor: AppColors.surface,
borderRadius: BorderRadius.lg,
marginBottom: Spacing.sm,
},
beneficiaryItemSelected: {
backgroundColor: '#E8F0FE',
borderWidth: 2,
borderColor: AppColors.primary,
},
beneficiaryInfo: {
flex: 1,
},
beneficiaryName: {
fontSize: FontSizes.base,
fontWeight: '600',
color: AppColors.textPrimary,
},
beneficiaryStatus: {
fontSize: FontSizes.sm,
color: AppColors.textMuted,
marginTop: 2,
},
statusDot: {
width: 10,
height: 10,
borderRadius: 5,
marginLeft: Spacing.sm,
},
emptyState: {
alignItems: 'center',
padding: Spacing.xl,
},
emptyStateText: {
marginTop: Spacing.md,
fontSize: FontSizes.base,
color: AppColors.textMuted,
},
});

View File

@ -29,7 +29,7 @@ export const AppColors = {
textMuted: '#999999', textMuted: '#999999',
textLight: '#FFFFFF', textLight: '#FFFFFF',
// Patient Status // Beneficiary Status
online: '#5AC8A8', online: '#5AC8A8',
offline: '#999999', offline: '#999999',
}; };

View File

@ -1,6 +1,6 @@
import * as SecureStore from 'expo-secure-store'; import * as SecureStore from 'expo-secure-store';
import * as Crypto from 'expo-crypto'; import * as Crypto from 'expo-crypto';
import type { AuthResponse, ChatResponse, Beneficiary, ApiResponse, ApiError, DashboardSingleResponse, PatientDashboardData } from '@/types'; import type { AuthResponse, ChatResponse, Beneficiary, ApiResponse, ApiError, DashboardSingleResponse, BeneficiaryDashboardData } from '@/types';
// Callback for handling unauthorized responses (401) // Callback for handling unauthorized responses (401)
let onUnauthorizedCallback: (() => void) | null = null; let onUnauthorizedCallback: (() => void) | null = null;
@ -217,15 +217,15 @@ class ApiService {
} }
async getBeneficiary(id: number): Promise<ApiResponse<Beneficiary>> { async getBeneficiary(id: number): Promise<ApiResponse<Beneficiary>> {
// Use real API data via getPatientDashboard // Use real API data via getBeneficiaryDashboard
const response = await this.getPatientDashboard(id.toString()); const response = await this.getBeneficiaryDashboard(id.toString());
if (!response.ok || !response.data) { if (!response.ok || !response.data) {
return { ok: false, error: response.error || { message: 'Beneficiary not found', code: 'NOT_FOUND' } }; return { ok: false, error: response.error || { message: 'Beneficiary not found', code: 'NOT_FOUND' } };
} }
const data = response.data; const data = response.data;
// Determine if patient is "online" based on last_detected_time // Determine if beneficiary is "online" based on last_detected_time
const lastDetected = data.last_detected_time ? new Date(data.last_detected_time) : null; const lastDetected = data.last_detected_time ? new Date(data.last_detected_time) : null;
const isRecent = lastDetected && (Date.now() - lastDetected.getTime()) < 30 * 60 * 1000; // 30 min const isRecent = lastDetected && (Date.now() - lastDetected.getTime()) < 30 * 60 * 1000; // 30 min
@ -254,8 +254,8 @@ class ApiService {
return { data: beneficiary, ok: true }; return { data: beneficiary, ok: true };
} }
// Get patient dashboard data by deployment_id // Get beneficiary dashboard data by deployment_id
async getPatientDashboard(deploymentId: string): Promise<ApiResponse<PatientDashboardData>> { async getBeneficiaryDashboard(deploymentId: string): Promise<ApiResponse<BeneficiaryDashboardData>> {
const token = await this.getToken(); const token = await this.getToken();
const userName = await this.getUserName(); const userName = await this.getUserName();
@ -280,65 +280,52 @@ class ApiService {
return { return {
ok: false, ok: false,
error: response.error || { message: 'Failed to get patient data' }, error: response.error || { message: 'Failed to get beneficiary data' },
}; };
} }
// Get all patients from privileges (deployment_ids) // Get all beneficiaries using deployments_list API (single fast request)
async getAllPatients(): Promise<ApiResponse<Beneficiary[]>> { async getAllBeneficiaries(): Promise<ApiResponse<Beneficiary[]>> {
const token = await this.getToken(); const token = await this.getToken();
if (!token) { const userName = await this.getUserName();
if (!token || !userName) {
return { ok: false, error: { message: 'Not authenticated', code: 'UNAUTHORIZED' } }; return { ok: false, error: { message: 'Not authenticated', code: 'UNAUTHORIZED' } };
} }
const privileges = await SecureStore.getItemAsync('privileges'); // Use deployments_list API - single request for all beneficiaries
if (!privileges) { const response = await this.makeRequest<{ result_list: Array<{
return { ok: true, data: [] }; deployment_id: number;
} email: string;
first_name: string;
const deploymentIds = privileges.split(',').map(id => id.trim()).filter(id => id); last_name: string;
const patients: Beneficiary[] = []; }> }>({
function: 'deployments_list',
// Fetch data for each deployment_id user_name: userName,
for (const deploymentId of deploymentIds) { token: token,
const response = await this.getPatientDashboard(deploymentId); first: '0',
if (response.ok && response.data) { last: '100',
const data = response.data;
// Determine if patient is "online" based on last_detected_time
const lastDetected = data.last_detected_time ? new Date(data.last_detected_time) : null;
const isRecent = lastDetected && (Date.now() - lastDetected.getTime()) < 30 * 60 * 1000; // 30 min
const deploymentId = parseInt(data.deployment_id, 10);
patients.push({
id: deploymentId,
name: data.name,
avatar: getAvatarForBeneficiary(deploymentId),
status: isRecent ? 'online' : 'offline',
address: data.address,
timezone: data.time_zone,
wellness_score: data.wellness_score_percent,
wellness_descriptor: data.wellness_descriptor,
last_location: data.last_location,
temperature: data.temperature,
units: data.units,
sleep_hours: data.sleep_hours,
bedroom_temperature: data.bedroom_temperature,
before_last_location: data.before_last_location,
last_detected_time: data.last_detected_time,
last_activity: data.last_detected_time
? formatTimeAgo(new Date(data.last_detected_time))
: undefined,
}); });
}
if (!response.ok || !response.data?.result_list) {
return { ok: false, error: response.error || { message: 'Failed to get beneficiaries' } };
} }
return { data: patients, ok: true }; const beneficiaries: Beneficiary[] = response.data.result_list.map(item => ({
id: item.deployment_id,
name: `${item.first_name} ${item.last_name}`.trim(),
avatar: getAvatarForBeneficiary(item.deployment_id),
status: 'offline' as const, // Will be updated when dashboard is loaded
email: item.email,
}));
return { data: beneficiaries, ok: true };
} }
// AI Chat - deploymentId is required, no default value for security // AI Chat - deploymentId is required, no default value for security
async sendMessage(question: string, deploymentId: string): Promise<ApiResponse<ChatResponse>> { async sendMessage(question: string, deploymentId: string): Promise<ApiResponse<ChatResponse>> {
if (!deploymentId) { if (!deploymentId) {
return { ok: false, error: { message: 'Please select a patient first', code: 'NO_PATIENT_SELECTED' } }; return { ok: false, error: { message: 'Please select a beneficiary first', code: 'NO_BENEFICIARY_SELECTED' } };
} }
const token = await this.getToken(); const token = await this.getToken();
const userName = await this.getUserName(); const userName = await this.getUserName();

View File

@ -45,11 +45,11 @@ export interface Beneficiary {
// Dashboard API response // Dashboard API response
export interface DashboardSingleResponse { export interface DashboardSingleResponse {
result_list: PatientDashboardData[]; result_list: BeneficiaryDashboardData[];
status: string; status: string;
} }
export interface PatientDashboardData { export interface BeneficiaryDashboardData {
user_id: number; user_id: number;
name: string; name: string;
address: string; address: string;