Hamza/Siro
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update: 2026-07-12 18:53:59

Browse Source
This commit is contained in:
Hamza-Ayed
2026-07-12 18:53:59 +03:00
parent 8cd4a4b57e
commit 653d73422f
54 changed files with 2078 additions and 436 deletions
Download Patch File Download Diff File Expand all files Collapse all files
siro_admin/lib/controller/transit/transit_admin_controller.dart
+48
View File
@@ -131,4 +131,52 @@ class TransitAdminController extends GetxController {
Get.snackbar('مواصلاتي', res.message);
}
}
// ── إدارة العقد ───────────────────────────────────────────────
bool isUpdatingContract = false;
Future<bool> updateContractStatus(int orgId, String contractStatus) async {
isUpdatingContract = true;
update();
final res = await TransitAdminService.updateContractStatus(
orgId: orgId, contractStatus: contractStatus);
isUpdatingContract = false;
if (res.success) {
await fetchOrgs();
return true;
}
Get.snackbar('مواصلاتي', res.message);
update();
return false;
}
// ── اعتماد الخطوط ──────────────────────────────────────────────
bool isLoadingPendingRoutes = false;
List<Map<String, dynamic>> pendingRoutes = [];
bool isApprovingRoute = false;
Future<void> fetchPendingRoutes({int? orgId}) async {
isLoadingPendingRoutes = true;
update();
final res = await TransitAdminService.listPendingRoutes(orgId: orgId);
if (res.success) pendingRoutes = res.data ?? [];
isLoadingPendingRoutes = false;
update();
}
Future<bool> approveRoute(int routeId, String action) async {
isApprovingRoute = true;
update();
final res = await TransitAdminService.approveRoute(
routeId: routeId, action: action);
isApprovingRoute = false;
if (res.success) {
pendingRoutes.removeWhere((r) => int.tryParse(r['id'].toString()) == routeId);
update();
return true;
}
Get.snackbar('مواصلاتي', res.message);
update();
return false;
}
}
siro_admin/lib/controller/transit/transit_admin_service.dart
+52
View File
@@ -136,4 +136,56 @@ class TransitAdminService {
if (res is Map && res['status'] == 'success') return TransitApiResult(true, null, 'ok');
return TransitApiResult(false, null, _errMsg(res));
}
// ── اعتماد الخطوط ──────────────────────────────────────────────
static Future<TransitApiResult<List<Map<String, dynamic>>>> listPendingRoutes({
int? orgId,
}) async {
final payload = <String, dynamic>{};
if (orgId != null) payload['org_id'] = orgId.toString();
final res =
await CRUD().post(link: '$_base/route/pending.php', payload: payload);
if (res is Map && res['status'] == 'success' && res['message'] is Map) {
final msg = res['message'] as Map;
final list = (msg['routes'] is List)
? (msg['routes'] as List)
.map((r) => Map<String, dynamic>.from(r))
.toList()
: <Map<String, dynamic>>[];
return TransitApiResult(true, list, 'ok');
}
return TransitApiResult(false, null, _errMsg(res));
}
static Future<TransitApiResult<Map<String, dynamic>>> updateContractStatus({
required int orgId,
required String contractStatus, // active | trial | suspended | terminated
}) async {
final res = await CRUD().post(link: '$_base/org/update.php', payload: {
'org_id': orgId.toString(),
'contract_status': contractStatus,
});
if (res is Map && res['status'] == 'success') {
return TransitApiResult(
true, Map<String, dynamic>.from(res['message'] ?? {}), 'ok');
}
return TransitApiResult(false, null, _errMsg(res));
}
static Future<TransitApiResult<Map<String, dynamic>>> approveRoute({
required int routeId,
required String action, // approve | suspend | reject
}) async {
final res = await CRUD().post(link: '$_base/route/approve.php', payload: {
'route_id': routeId.toString(),
'action': action,
});
if (res is Map && res['status'] == 'success') {
return TransitApiResult(
true, Map<String, dynamic>.from(res['message'] ?? {}), 'ok');
}
return TransitApiResult(false, null, _errMsg(res));
}
}
siro_admin/lib/views/transit/org_details_page.dart
+79
View File
@@ -41,6 +41,17 @@ class _TransitOrgDetailsPageState extends State<TransitOrgDetailsPage> {
() => TransitOrgAdminsPage(orgId: widget.orgId, orgName: widget.orgName),
),
),
PopupMenuButton<String>(
icon: const Icon(Icons.more_vert, color: AppColor.textSecondary),
color: AppColor.surface,
onSelected: (action) => _handleContractAction(action),
itemBuilder: (_) => [
_menuItem('active', 'تفعيل العقد', Icons.check_circle_outline, AppColor.success),
_menuItem('trial', 'وضع تجريبي', Icons.science_outlined, AppColor.info),
_menuItem('suspended', 'تعليق العقد', Icons.pause_circle_outline, AppColor.warning),
_menuItem('terminated', 'إنهاء العقد', Icons.cancel_outlined, AppColor.danger),
],
),
],
),
body: c.isLoadingDetails
@@ -53,6 +64,74 @@ class _TransitOrgDetailsPageState extends State<TransitOrgDetailsPage> {
);
}
PopupMenuItem<String> _menuItem(String value, String label, IconData icon, Color color) {
return PopupMenuItem<String>(
value: value,
child: Row(
children: [
Icon(icon, color: color, size: 18),
const SizedBox(width: 10),
Text(label, style: TextStyle(color: color, fontSize: 13)),
],
),
);
}
Future<void> _handleContractAction(String contractStatus) async {
final labels = {
'active': 'تفعيل العقد',
'trial': 'وضع تجريبي',
'suspended': 'تعليق العقد',
'terminated': 'إنهاء العقد',
};
final confirm = await showDialog<bool>(
context: context,
builder: (_) => AlertDialog(
backgroundColor: AppColor.surface,
title: Text(labels[contractStatus] ?? contractStatus,
style: const TextStyle(color: AppColor.textPrimary)),
content: Text(
contractStatus == 'terminated'
? 'سيتم إنهاء العقد وإبطال جميع جلسات المشرفين. هذا الإجراء خطير.'
: 'هل أنت متأكد من تغيير حالة العقد إلى "${labels[contractStatus]}"؟',
style: const TextStyle(color: AppColor.textSecondary),
),
actions: [
TextButton(
onPressed: () => Navigator.pop(context, false),
child: const Text('إلغاء', style: TextStyle(color: AppColor.textSecondary)),
),
TextButton(
onPressed: () => Navigator.pop(context, true),
child: Text(
labels[contractStatus] ?? contractStatus,
style: TextStyle(
color: contractStatus == 'terminated' ? AppColor.danger : AppColor.accent,
fontWeight: FontWeight.bold,
),
),
),
],
),
);
if (confirm != true) return;
final c = Get.find<TransitAdminController>();
final ok = await c.updateContractStatus(widget.orgId, contractStatus);
if (ok && mounted) {
ScaffoldMessenger.of(context).showSnackBar(SnackBar(
content: Text('تم تحديث حالة العقد إلى: ${labels[contractStatus]}'),
backgroundColor: contractStatus == 'terminated'
? AppColor.danger
: contractStatus == 'suspended'
? AppColor.warning
: AppColor.success,
));
c.loadOrgDetails(widget.orgId);
}
}
Widget _content(TransitAdminController c) {
final d = c.selectedOrgDetails!;
final counts = d.counts;
siro_admin/lib/views/transit/org_list_page.dart
+7
View File
@@ -7,6 +7,7 @@ import '../../controller/transit/transit_admin_controller.dart';
import '../../controller/transit/transit_admin_models.dart';
import 'org_create_page.dart';
import 'org_details_page.dart';
import 'route_approval_page.dart';
class TransitOrgListPage extends StatefulWidget {
const TransitOrgListPage({super.key});
@@ -34,6 +35,12 @@ class _TransitOrgListPageState extends State<TransitOrgListPage> {
elevation: 0,
title: const Text('مواصلاتي — المؤسسات', style: TextStyle(color: AppColor.textPrimary)),
actions: [
// زر اعتماد الخطوط
IconButton(
icon: const Icon(Icons.route_rounded, color: AppColor.warning),
tooltip: 'اعتماد الخطوط',
onPressed: () => Get.to(() => const RouteApprovalPage()),
),
IconButton(
icon: const Icon(Icons.add, color: AppColor.accent),
onPressed: () async {
siro_admin/lib/views/transit/route_approval_page.dart
+310
View File
@@ -0,0 +1,310 @@
// route_approval_page.dart — اعتماد خطوط مواصلاتي المسودة (لوحة سيرو آدمن)
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import '../../constant/colors.dart';
import '../../controller/transit/transit_admin_controller.dart';
class RouteApprovalPage extends StatefulWidget {
const RouteApprovalPage({super.key});
@override
State<RouteApprovalPage> createState() => _RouteApprovalPageState();
}
class _RouteApprovalPageState extends State<RouteApprovalPage> {
@override
void initState() {
super.initState();
WidgetsBinding.instance.addPostFrameCallback((_) {
Get.find<TransitAdminController>().fetchPendingRoutes();
});
}
@override
Widget build(BuildContext context) {
return Scaffold(
backgroundColor: AppColor.bg,
appBar: AppBar(
backgroundColor: AppColor.bg,
elevation: 0,
title: const Text(
'مواصلاتي — اعتماد الخطوط',
style: TextStyle(color: AppColor.textPrimary, fontWeight: FontWeight.bold),
),
iconTheme: const IconThemeData(color: AppColor.textPrimary),
actions: [
IconButton(
icon: const Icon(Icons.refresh_rounded, color: AppColor.accent),
onPressed: () =>
Get.find<TransitAdminController>().fetchPendingRoutes(),
),
],
),
body: GetBuilder<TransitAdminController>(
builder: (c) {
if (c.isLoadingPendingRoutes) {
return const Center(
child: CircularProgressIndicator(color: AppColor.accent));
}
if (c.pendingRoutes.isEmpty) {
return Center(
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
Icon(Icons.check_circle_outline_rounded,
size: 64, color: AppColor.success.withOpacity(0.6)),
const SizedBox(height: 16),
const Text(
'لا توجد خطوط تنتظر الاعتماد',
style: TextStyle(
color: AppColor.textSecondary,
fontSize: 16,
fontWeight: FontWeight.w600),
),
],
),
);
}
return ListView.builder(
padding: const EdgeInsets.all(16),
itemCount: c.pendingRoutes.length,
itemBuilder: (_, i) => _RouteCard(
route: c.pendingRoutes[i],
onApprove: (action) async {
final routeId =
int.tryParse(c.pendingRoutes[i]['id'].toString()) ?? 0;
if (routeId == 0) return;
final ok = await c.approveRoute(routeId, action);
if (ok && mounted) {
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
content: Text(action == 'approve'
? 'تم اعتماد الخط ✓'
: 'تم رفض الخط'),
backgroundColor: action == 'approve'
? AppColor.success
: AppColor.danger,
),
);
}
},
),
);
},
),
);
}
}
class _RouteCard extends StatelessWidget {
final Map<String, dynamic> route;
final void Function(String action) onApprove;
const _RouteCard({required this.route, required this.onApprove});
@override
Widget build(BuildContext context) {
final stops = (route['stops'] is List) ? route['stops'] as List : [];
final stopsCount =
int.tryParse(route['stops_count']?.toString() ?? '0') ?? stops.length;
final distKm = route['distance_km']?.toString() ?? '—';
final durMin = route['duration_min']?.toString() ?? '—';
final direction = route['direction']?.toString() ?? '';
final orgName = route['org_name']?.toString() ?? '';
return Container(
margin: const EdgeInsets.only(bottom: 16),
decoration: BoxDecoration(
color: AppColor.surface,
borderRadius: BorderRadius.circular(16),
border: Border.all(color: AppColor.divider),
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
// ── هيدر الكارد ──────────────────────────────────
Padding(
padding: const EdgeInsets.all(16),
child: Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Container(
width: 44,
height: 44,
decoration: BoxDecoration(
color: AppColor.accentSoft,
borderRadius: BorderRadius.circular(12),
),
child: const Icon(Icons.route_rounded,
color: AppColor.accent, size: 24),
),
const SizedBox(width: 12),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
route['name_ar']?.toString() ?? '',
style: const TextStyle(
color: AppColor.textPrimary,
fontWeight: FontWeight.bold,
fontSize: 15),
),
if (orgName.isNotEmpty) ...[
const SizedBox(height: 2),
Text(orgName,
style: const TextStyle(
color: AppColor.accent,
fontSize: 12,
fontWeight: FontWeight.w500)),
],
],
),
),
_TagChip(
label: direction == 'outbound' ? 'ذهاب' : 'إياب',
color: direction == 'outbound'
? AppColor.info
: AppColor.warning,
),
],
),
),
// ── إحصائيات ─────────────────────────────────────
Padding(
padding: const EdgeInsets.symmetric(horizontal: 16),
child: Row(
children: [
_StatChip(
icon: Icons.location_on_rounded,
label: '$stopsCount محطة'),
const SizedBox(width: 8),
if (distKm != '—') _StatChip(icon: Icons.straighten_rounded, label: '$distKm كم'),
const SizedBox(width: 8),
if (durMin != '—') _StatChip(icon: Icons.timer_rounded, label: '$durMin د'),
],
),
),
// ── قائمة المحطات ──────────────────────────────
if (stops.isNotEmpty) ...[
const SizedBox(height: 12),
Padding(
padding: const EdgeInsets.symmetric(horizontal: 16),
child: Text('المحطات:',
style: TextStyle(
color: AppColor.textSecondary.withOpacity(0.8),
fontSize: 12,
fontWeight: FontWeight.w600)),
),
SizedBox(
height: 32,
child: ListView.separated(
scrollDirection: Axis.horizontal,
padding:
const EdgeInsets.symmetric(horizontal: 16, vertical: 4),
itemCount: stops.length,
separatorBuilder: (_, __) => const Padding(
padding: EdgeInsets.symmetric(horizontal: 4),
child: Icon(Icons.arrow_forward_ios_rounded,
size: 10, color: AppColor.textMuted),
),
itemBuilder: (_, i) => Text(
stops[i]['name_ar']?.toString() ?? '•',
style: const TextStyle(
color: AppColor.textSecondary, fontSize: 12),
),
),
),
],
// ── أزرار الإجراءات ──────────────────────────────
Padding(
padding: const EdgeInsets.all(12),
child: Row(
children: [
Expanded(
child: OutlinedButton(
onPressed: () => onApprove('reject'),
style: OutlinedButton.styleFrom(
side: const BorderSide(color: AppColor.danger),
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(10)),
),
child: const Text('رفض',
style: TextStyle(color: AppColor.danger)),
),
),
const SizedBox(width: 10),
Expanded(
flex: 2,
child: ElevatedButton(
onPressed: () => onApprove('approve'),
style: ElevatedButton.styleFrom(
backgroundColor: AppColor.success,
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(10)),
),
child: const Text('اعتماد الخط',
style: TextStyle(
color: Colors.white, fontWeight: FontWeight.bold)),
),
),
],
),
),
],
),
);
}
}
class _TagChip extends StatelessWidget {
final String label;
final Color color;
const _TagChip({required this.label, required this.color});
@override
Widget build(BuildContext context) {
return Container(
padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 4),
decoration: BoxDecoration(
color: color.withOpacity(0.12),
borderRadius: BorderRadius.circular(20),
border: Border.all(color: color.withOpacity(0.3)),
),
child: Text(label,
style: TextStyle(color: color, fontSize: 11, fontWeight: FontWeight.bold)),
);
}
}
class _StatChip extends StatelessWidget {
final IconData icon;
final String label;
const _StatChip({required this.icon, required this.label});
@override
Widget build(BuildContext context) {
return Container(
padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4),
decoration: BoxDecoration(
color: AppColor.surfaceElevated,
borderRadius: BorderRadius.circular(8),
),
child: Row(
mainAxisSize: MainAxisSize.min,
children: [
Icon(icon, size: 12, color: AppColor.textMuted),
const SizedBox(width: 4),
Text(label,
style: const TextStyle(color: AppColor.textSecondary, fontSize: 11)),
],
),
);
}
}