chore: استيراد أولي من سيرو (ecfe7568) — بلا أي تعديل
نسخة كاملة من مستودع سيرو عند ecfe7568 لتكون أساس تطبيق «انطلق». نُسخ المتعقَّب في git فقط (12,509 ملفاً / 302 م.ب) بـ git archive، لا `cp -r` — فاستُثنيت تلقائياً مخلفات البناء (build · node_modules · .dart_tool · .gradle · Pods ≈ 10.7 غ.ب) وكل ما يستثنيه .gitignore. هذا الكوميت **بلا أي تعديل عمداً** حتى يكون كل ما يليه فرقاً مقروءاً مقابل سيرو الأصلي. سيرو نفسه لم يُمسّ. ⚠️ لا يبني بعد: `.env` و`lib/env/env.g.dart` غير متعقَّبين في سيرو (وهذا صحيح — أسرار لكل مستأجر). كل تطبيق فلاتر هنا يحتاج .env خاصاً بانطلق ثم توليد env.g.dart عبر build_runner. لا تُنسخ أسرار سيرو. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
@@ -0,0 +1,112 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:get/get.dart';
|
||||
|
||||
import '../../constant/colors.dart';
|
||||
import '../../constant/style.dart';
|
||||
import '../../controller/transit/transit_driver_controller.dart';
|
||||
import '../widgets/elevated_btn.dart';
|
||||
import '../widgets/error_snakbar.dart';
|
||||
|
||||
class ManualBoardingPage extends StatefulWidget {
|
||||
final int stopId;
|
||||
final String stopName;
|
||||
const ManualBoardingPage({super.key, required this.stopId, required this.stopName});
|
||||
|
||||
@override
|
||||
State<ManualBoardingPage> createState() => _ManualBoardingPageState();
|
||||
}
|
||||
|
||||
class _ManualBoardingPageState extends State<ManualBoardingPage> {
|
||||
bool isLoading = true;
|
||||
List<Map<String, dynamic>> passengers = [];
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
_loadPassengers();
|
||||
}
|
||||
|
||||
Future<void> _loadPassengers() async {
|
||||
final c = Get.find<TransitDriverController>();
|
||||
// For now, this is a placeholder. You'll need to add getStopPassengers in the controller.
|
||||
final result = await c.getStopPassengers(widget.stopId);
|
||||
if (mounted) {
|
||||
setState(() {
|
||||
passengers = result;
|
||||
isLoading = false;
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
void _markBoarded(int index) async {
|
||||
final c = Get.find<TransitDriverController>();
|
||||
final pId = passengers[index]['passenger_id']?.toString() ?? '';
|
||||
if (pId.isEmpty) return;
|
||||
|
||||
final success = await c.boardPassenger(widget.stopId, pId);
|
||||
if (success && mounted) {
|
||||
setState(() {
|
||||
passengers[index]['is_boarded'] = true;
|
||||
});
|
||||
mySnackbarSuccess('تم تسجيل حضور الراكب'.tr);
|
||||
} else {
|
||||
mySnackbarError('فشل تسجيل الحضور'.tr);
|
||||
}
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Scaffold(
|
||||
backgroundColor: AppColor.secondaryColor,
|
||||
appBar: AppBar(
|
||||
title: Text('${'Manual List'.tr} - ${widget.stopName}', style: AppStyle.headTitle2.copyWith(color: AppColor.writeColor)),
|
||||
backgroundColor: AppColor.secondaryColor,
|
||||
elevation: 0,
|
||||
iconTheme: IconThemeData(color: AppColor.writeColor),
|
||||
),
|
||||
body: isLoading
|
||||
? const Center(child: CircularProgressIndicator())
|
||||
: passengers.isEmpty
|
||||
? Center(child: Text('لا يوجد ركاب مسجلين في هذه المحطة'.tr))
|
||||
: ListView.builder(
|
||||
padding: const EdgeInsets.all(16),
|
||||
itemCount: passengers.length,
|
||||
itemBuilder: (context, index) {
|
||||
final p = passengers[index];
|
||||
final isBoarded = p['is_boarded'] == true;
|
||||
|
||||
return Container(
|
||||
margin: const EdgeInsets.only(bottom: 12),
|
||||
decoration: BoxDecoration(
|
||||
color: AppColor.cardColor,
|
||||
borderRadius: BorderRadius.circular(14),
|
||||
boxShadow: [
|
||||
BoxShadow(color: Colors.black.withOpacity(0.04), blurRadius: 10, offset: const Offset(0, 2))
|
||||
],
|
||||
),
|
||||
child: ListTile(
|
||||
contentPadding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
|
||||
leading: CircleAvatar(
|
||||
backgroundColor: isBoarded ? AppColor.greenColor.withOpacity(0.2) : AppColor.grayColor.withOpacity(0.2),
|
||||
child: Icon(Icons.person, color: isBoarded ? AppColor.greenColor : AppColor.grayColor),
|
||||
),
|
||||
title: Text(p['name'] ?? 'Unknown', style: AppStyle.title.copyWith(fontWeight: FontWeight.bold)),
|
||||
subtitle: Text('ID: ${p['student_id'] ?? p['passenger_id']}', style: AppStyle.subtitle.copyWith(color: AppColor.grayColor)),
|
||||
trailing: isBoarded
|
||||
? const Icon(Icons.check_circle, color: AppColor.greenColor, size: 28)
|
||||
: SizedBox(
|
||||
width: 80,
|
||||
height: 35,
|
||||
child: MyElevatedButton(
|
||||
title: 'حاضر'.tr,
|
||||
kolor: AppColor.accentColor,
|
||||
onPressed: () => _markBoarded(index),
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
},
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,159 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:mobile_scanner/mobile_scanner.dart';
|
||||
import 'package:audioplayers/audioplayers.dart';
|
||||
|
||||
import '../../constant/colors.dart';
|
||||
import '../../constant/style.dart';
|
||||
import '../../controller/transit/transit_driver_controller.dart';
|
||||
import '../widgets/elevated_btn.dart';
|
||||
import 'manual_boarding_page.dart';
|
||||
|
||||
class QRScannerPage extends StatefulWidget {
|
||||
final int stopId;
|
||||
final String stopName;
|
||||
const QRScannerPage({super.key, required this.stopId, required this.stopName});
|
||||
|
||||
@override
|
||||
State<QRScannerPage> createState() => _QRScannerPageState();
|
||||
}
|
||||
|
||||
class _QRScannerPageState extends State<QRScannerPage> {
|
||||
final MobileScannerController _scannerController = MobileScannerController();
|
||||
final AudioPlayer _audioPlayer = AudioPlayer();
|
||||
|
||||
bool _isProcessing = false;
|
||||
String _successMessage = '';
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
_scannerController.dispose();
|
||||
_audioPlayer.dispose();
|
||||
super.dispose();
|
||||
}
|
||||
|
||||
void _onDetect(BarcodeCapture capture) async {
|
||||
if (_isProcessing) return;
|
||||
|
||||
final List<Barcode> barcodes = capture.barcodes;
|
||||
if (barcodes.isEmpty) return;
|
||||
|
||||
final String? code = barcodes.first.rawValue;
|
||||
if (code == null || !code.startsWith('transit_board:')) return;
|
||||
|
||||
setState(() {
|
||||
_isProcessing = true;
|
||||
});
|
||||
|
||||
final passengerId = code.replaceAll('transit_board:', '');
|
||||
|
||||
// Play beep sound
|
||||
try {
|
||||
// Assuming you might add a beep sound asset later, or just visual feedback for now.
|
||||
// await _audioPlayer.play(AssetSource('sounds/beep.mp3'));
|
||||
} catch (_) {}
|
||||
|
||||
// Send API Request
|
||||
final c = Get.find<TransitDriverController>();
|
||||
final success = await c.boardPassenger(widget.stopId, passengerId);
|
||||
|
||||
if (success) {
|
||||
setState(() {
|
||||
_successMessage = 'تم صعود الراكب بنجاح ✅'.tr;
|
||||
});
|
||||
// Clear message after 1.5s
|
||||
Future.delayed(const Duration(milliseconds: 1500), () {
|
||||
if (mounted) {
|
||||
setState(() {
|
||||
_successMessage = '';
|
||||
_isProcessing = false;
|
||||
});
|
||||
}
|
||||
});
|
||||
} else {
|
||||
setState(() {
|
||||
_successMessage = 'فشل التحقق ❌'.tr;
|
||||
});
|
||||
Future.delayed(const Duration(milliseconds: 2000), () {
|
||||
if (mounted) {
|
||||
setState(() {
|
||||
_successMessage = '';
|
||||
_isProcessing = false;
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Scaffold(
|
||||
backgroundColor: Colors.black,
|
||||
appBar: AppBar(
|
||||
title: Text('${'Scan Passengers'.tr} - ${widget.stopName}', style: AppStyle.headTitle2.copyWith(color: Colors.white)),
|
||||
backgroundColor: Colors.transparent,
|
||||
elevation: 0,
|
||||
iconTheme: const IconThemeData(color: Colors.white),
|
||||
),
|
||||
body: Stack(
|
||||
children: [
|
||||
MobileScanner(
|
||||
controller: _scannerController,
|
||||
onDetect: _onDetect,
|
||||
),
|
||||
|
||||
// Overlay for scanner target
|
||||
Center(
|
||||
child: Container(
|
||||
width: 250,
|
||||
height: 250,
|
||||
decoration: BoxDecoration(
|
||||
border: Border.all(color: AppColor.accentColor, width: 3),
|
||||
borderRadius: BorderRadius.circular(20),
|
||||
),
|
||||
),
|
||||
),
|
||||
|
||||
// Processing Overlay
|
||||
if (_isProcessing && _successMessage.isEmpty)
|
||||
Container(
|
||||
color: Colors.black54,
|
||||
child: const Center(
|
||||
child: CircularProgressIndicator(color: AppColor.accentColor),
|
||||
),
|
||||
),
|
||||
|
||||
// Success / Error Message Overlay
|
||||
if (_successMessage.isNotEmpty)
|
||||
Container(
|
||||
color: _successMessage.contains('✅') ? Colors.green.withValues(alpha: 0.8) : Colors.red.withValues(alpha: 0.8),
|
||||
child: Center(
|
||||
child: Text(
|
||||
_successMessage,
|
||||
style: AppStyle.headTitle2.copyWith(color: Colors.white),
|
||||
textAlign: TextAlign.center,
|
||||
),
|
||||
),
|
||||
),
|
||||
|
||||
// Fallback manual list button
|
||||
Positioned(
|
||||
bottom: 40,
|
||||
left: 20,
|
||||
right: 20,
|
||||
child: SizedBox(
|
||||
height: 55,
|
||||
child: MyElevatedButton(
|
||||
onPressed: () {
|
||||
Get.to(() => ManualBoardingPage(stopId: widget.stopId, stopName: widget.stopName));
|
||||
},
|
||||
kolor: AppColor.cardColor,
|
||||
title: 'Manual Passenger List'.tr,
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,305 @@
|
||||
// transit_driver_home_page.dart — رحلات اليوم لسائق الباص (مواصلاتي)
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:get/get.dart';
|
||||
|
||||
import '../../constant/colors.dart';
|
||||
import '../../constant/style.dart';
|
||||
import '../../controller/transit/transit_driver_controller.dart';
|
||||
import '../../controller/transit/transit_driver_models.dart';
|
||||
import '../widgets/elevated_btn.dart';
|
||||
import '../widgets/my_scafold.dart';
|
||||
import 'qr_scanner_page.dart';
|
||||
|
||||
class TransitDriverHomePage extends StatelessWidget {
|
||||
const TransitDriverHomePage({super.key});
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
Get.put(TransitDriverController());
|
||||
|
||||
return GetBuilder<TransitDriverController>(
|
||||
builder: (c) {
|
||||
// ── حالة التحميل ─────────────────────────────────────────
|
||||
if (c.isCheckingBusDriver) {
|
||||
return MyScafolld(
|
||||
title: 'Mawasalati'.tr,
|
||||
isleading: true,
|
||||
body: const [Column(children: [Expanded(child: Center(child: CircularProgressIndicator()))])],
|
||||
);
|
||||
}
|
||||
|
||||
// ── حساب غير مفعّل — شاشة إدخال التوكن ─────────────────
|
||||
if (!c.isBusDriver) {
|
||||
return _ActivationPage(controller: c);
|
||||
}
|
||||
|
||||
// ── رحلات اليوم ──────────────────────────────────────────
|
||||
return MyScafolld(
|
||||
title: c.orgName,
|
||||
isleading: true,
|
||||
body: [
|
||||
Column(
|
||||
children: [
|
||||
// بانر المحطة الحالية إن كانت هناك رحلة نشطة
|
||||
if (c.activeTrip != null && c.currentStop != null)
|
||||
_CurrentStopBanner(stop: c.currentStop!),
|
||||
|
||||
Expanded(
|
||||
child: RefreshIndicator(
|
||||
onRefresh: c.fetchTodayTrips,
|
||||
child: c.isLoadingTrips
|
||||
? const Center(child: CircularProgressIndicator())
|
||||
: c.todayTrips.isEmpty
|
||||
? ListView(
|
||||
children: [
|
||||
const SizedBox(height: 80),
|
||||
Center(
|
||||
child: Text('No trips today'.tr, style: AppStyle.title),
|
||||
),
|
||||
],
|
||||
)
|
||||
: ListView.builder(
|
||||
padding: const EdgeInsets.all(16),
|
||||
itemCount: c.todayTrips.length,
|
||||
itemBuilder: (_, i) => _tripCard(c, c.todayTrips[i]),
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
],
|
||||
);
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
Widget _tripCard(TransitDriverController c, TransitDriverTrip trip) {
|
||||
final isStarted = trip.status == 'started';
|
||||
final isCompleted = trip.status == 'completed';
|
||||
|
||||
return Card(
|
||||
margin: const EdgeInsets.only(bottom: 14),
|
||||
color: AppColor.cardColor,
|
||||
elevation: 0,
|
||||
shape: RoundedRectangleBorder(
|
||||
borderRadius: BorderRadius.circular(14),
|
||||
side: BorderSide(
|
||||
color: isStarted ? AppColor.greenColor : AppColor.borderColor,
|
||||
width: isStarted ? 1.5 : 1),
|
||||
),
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.all(14),
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Row(
|
||||
children: [
|
||||
Icon(Icons.directions_bus, color: AppColor.accentColor),
|
||||
const SizedBox(width: 8),
|
||||
Expanded(
|
||||
child: Text(trip.routeName,
|
||||
style: AppStyle.title.copyWith(fontWeight: FontWeight.bold)),
|
||||
),
|
||||
if (trip.departureTime != null)
|
||||
Text(trip.departureTime!, style: AppStyle.subtitle),
|
||||
],
|
||||
),
|
||||
const SizedBox(height: 4),
|
||||
Text('${trip.stops.length} ${'Stops'.tr}', style: AppStyle.subtitle),
|
||||
if (trip.delayMinutes > 0)
|
||||
Padding(
|
||||
padding: const EdgeInsets.only(top: 6),
|
||||
child: Text(
|
||||
'${'Delayed by'.tr} ${trip.delayMinutes} ${'min'.tr}',
|
||||
style: AppStyle.subtitle.copyWith(color: AppColor.yellowColor)),
|
||||
),
|
||||
const SizedBox(height: 12),
|
||||
if (!isCompleted)
|
||||
Row(
|
||||
children: [
|
||||
Expanded(
|
||||
child: MyElevatedButton(
|
||||
title: isStarted ? 'End Trip'.tr : 'Start Trip'.tr,
|
||||
kolor: isStarted ? AppColor.redColor : AppColor.greenColor,
|
||||
onPressed: c.isActionInProgress
|
||||
? () {}
|
||||
: () => isStarted ? c.endTrip(trip) : c.startTrip(trip),
|
||||
),
|
||||
),
|
||||
if (isStarted) ...[
|
||||
const SizedBox(width: 8),
|
||||
IconButton(
|
||||
icon: Icon(Icons.report_gmailerrorred, color: AppColor.yellowColor),
|
||||
onPressed: () => _showDelayDialog(c, trip),
|
||||
),
|
||||
],
|
||||
],
|
||||
)
|
||||
else
|
||||
Text('Trip completed'.tr,
|
||||
style: AppStyle.subtitle.copyWith(color: AppColor.greenColor)),
|
||||
],
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
void _showDelayDialog(TransitDriverController c, TransitDriverTrip trip) {
|
||||
final ctrl = TextEditingController(text: '5');
|
||||
Get.defaultDialog(
|
||||
title: 'Report Delay'.tr,
|
||||
content: Column(
|
||||
children: [
|
||||
TextField(
|
||||
controller: ctrl,
|
||||
keyboardType: TextInputType.number,
|
||||
decoration: InputDecoration(labelText: 'Number of minutes'.tr),
|
||||
),
|
||||
],
|
||||
),
|
||||
textConfirm: 'Send'.tr,
|
||||
textCancel: 'Cancel'.tr,
|
||||
onConfirm: () {
|
||||
final minutes = int.tryParse(ctrl.text.trim()) ?? 5;
|
||||
c.reportDelay(trip, minutes);
|
||||
Get.back();
|
||||
},
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
// ── شاشة التفعيل بتوكن الدعوة ──────────────────────────────────────────────
|
||||
|
||||
class _ActivationPage extends StatelessWidget {
|
||||
final TransitDriverController controller;
|
||||
const _ActivationPage({required this.controller});
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final tokenCtrl = TextEditingController();
|
||||
|
||||
return MyScafolld(
|
||||
title: 'Mawasalati'.tr,
|
||||
isleading: true,
|
||||
body: [
|
||||
Column(
|
||||
children: [
|
||||
Expanded(
|
||||
child: SingleChildScrollView(
|
||||
padding: const EdgeInsets.all(24),
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.center,
|
||||
children: [
|
||||
const SizedBox(height: 40),
|
||||
Container(
|
||||
width: 88,
|
||||
height: 88,
|
||||
decoration: BoxDecoration(
|
||||
color: AppColor.accentColor.withValues(alpha: 0.12),
|
||||
shape: BoxShape.circle,
|
||||
),
|
||||
child: Icon(Icons.directions_bus_rounded,
|
||||
size: 46, color: AppColor.accentColor),
|
||||
),
|
||||
const SizedBox(height: 24),
|
||||
Text(
|
||||
'This account is not registered as a bus driver in any institution'.tr,
|
||||
textAlign: TextAlign.center,
|
||||
style: AppStyle.title,
|
||||
),
|
||||
const SizedBox(height: 8),
|
||||
Text(
|
||||
'Activate Bus Driver Account'.tr,
|
||||
textAlign: TextAlign.center,
|
||||
style: AppStyle.subtitle,
|
||||
),
|
||||
const SizedBox(height: 32),
|
||||
TextField(
|
||||
controller: tokenCtrl,
|
||||
textAlign: TextAlign.center,
|
||||
decoration: InputDecoration(
|
||||
labelText: 'Invite Token'.tr,
|
||||
hintText: 'Paste the token from the WhatsApp message'.tr,
|
||||
border: OutlineInputBorder(
|
||||
borderRadius: BorderRadius.circular(12)),
|
||||
contentPadding: const EdgeInsets.symmetric(
|
||||
horizontal: 16, vertical: 14),
|
||||
),
|
||||
),
|
||||
if (controller.activationError.isNotEmpty) ...[
|
||||
const SizedBox(height: 12),
|
||||
Text(
|
||||
controller.activationError,
|
||||
style: AppStyle.subtitle.copyWith(color: AppColor.redColor),
|
||||
textAlign: TextAlign.center,
|
||||
),
|
||||
],
|
||||
const SizedBox(height: 20),
|
||||
SizedBox(
|
||||
width: double.infinity,
|
||||
height: 55,
|
||||
child: controller.isActivating
|
||||
? const Center(child: CircularProgressIndicator())
|
||||
: MyElevatedButton(
|
||||
kolor: AppColor.accentColor,
|
||||
onPressed: () =>
|
||||
controller.activateWithToken(tokenCtrl.text),
|
||||
title: 'Activate'.tr,
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 16),
|
||||
TextButton(
|
||||
onPressed: controller.checkBusDriverStatus,
|
||||
child: Text('Refresh'.tr,
|
||||
style: AppStyle.subtitle.copyWith(color: AppColor.accentColor)),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
],
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
// ── بانر المحطة الحالية ──────────────────────────────────────────────────────
|
||||
|
||||
class _CurrentStopBanner extends StatelessWidget {
|
||||
final TransitStopInfo stop;
|
||||
const _CurrentStopBanner({required this.stop});
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Container(
|
||||
width: double.infinity,
|
||||
padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 10),
|
||||
color: AppColor.greenColor.withValues(alpha: 0.12),
|
||||
child: Row(
|
||||
children: [
|
||||
Icon(Icons.location_on_rounded, color: AppColor.greenColor, size: 18),
|
||||
const SizedBox(width: 8),
|
||||
Expanded(
|
||||
child: Text(
|
||||
'${'Now at'.tr}: ${stop.nameAr}',
|
||||
style: AppStyle.subtitle.copyWith(
|
||||
color: AppColor.greenColor, fontWeight: FontWeight.bold),
|
||||
),
|
||||
),
|
||||
SizedBox(
|
||||
height: 35,
|
||||
width: 80,
|
||||
child: MyElevatedButton(
|
||||
onPressed: () {
|
||||
Get.to(() => QRScannerPage(stopId: stop.id, stopName: stop.nameAr));
|
||||
},
|
||||
kolor: AppColor.accentColor,
|
||||
title: 'Scan'.tr,
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user