modified transfers

Mugamba669 · Mugamba669 · commit 9a4e0b333544 · 2024-07-28T12:49:11.000+03:00
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -8,6 +8,7 @@
     "fullscreen",
     "hometeam",
     "kickofftime",
+    "LTRB",
     "matchdates",
     "matchs",
     "minutesplayed",
diff --git a/lib/apis/Apis.dart b/lib/apis/Apis.dart
@@ -70,4 +70,7 @@ class Apis {
   static String updateHandBallStats = "${apiUrl}handBall/update/";
   static String deleteHandBallStats = "${apiUrl}handBall/delete/";
   static String fetchHandBallPlayer = "${apiUrl}handBall/player/";
+// transfers
+  static String transferredPlayers = "${apiUrl}player/";
+  static String deleteTransfer = "${apiUrl}player/deleteTransfer/";
 }
diff --git a/lib/controllers/player_controller.dart b/lib/controllers/player_controller.dart
@@ -1,3 +1,4 @@
+import 'package:samba_stats/models/player.dart';
 import 'package:samba_stats/services/player_service.dart';
 
 import '../models/handball_player_model.dart';
@@ -40,4 +41,24 @@ class PlayerController with ChangeNotifier {
     _isLoading = val;
     notifyListeners();
   }
+
+  // function to work on transfers
+  List<Message> _transfers = [];
+  List<Message> get transfers => _transfers;
+  // handle loading
+  bool _isTransferring = false;
+  bool get isTransferring => _isTransferring;
+  set isTransferring(bool val) {
+    _isTransferring = val;
+  }
+
+//
+  void fetchTransfers(String league) {
+    isTransferring = true;
+    PlayerService.getTransferredPlayers(league).then((data) {
+      _transfers = data;
+      isTransferring = false;
+      notifyListeners();
+    });
+  }
 }
diff --git a/lib/models/player.dart b/lib/models/player.dart
@@ -1,3 +1,7 @@
+// To parse this JSON data, do
+//
+//     final playersModel = playersModelFromJson(jsonString);
+
 import 'dart:convert';
 
 PlayersModel playersModelFromJson(String str) =>
@@ -41,6 +45,7 @@ class Message {
   final DateTime createdAt;
   final DateTime updatedAt;
   final int v;
+  final Team oldTeam;
 
   Message({
     required this.cleanSheet,
@@ -57,6 +62,7 @@ class Message {
     required this.createdAt,
     required this.updatedAt,
     required this.v,
+    required this.oldTeam,
   });
 
   factory Message.fromJson(Map<String, dynamic> json) => Message(
@@ -74,6 +80,7 @@ class Message {
         createdAt: DateTime.parse(json["createdAt"]),
         updatedAt: DateTime.parse(json["updatedAt"]),
         v: json["__v"],
+        oldTeam: Team.fromJson(json["old_team"] ?? {}),
       );
 
   Map<String, dynamic> toJson() => {
@@ -91,6 +98,7 @@ class Message {
         "createdAt": createdAt.toIso8601String(),
         "updatedAt": updatedAt.toIso8601String(),
         "__v": v,
+        "old_team": oldTeam.toJson(),
       };
 }
 
@@ -106,9 +114,9 @@ class Team {
   });
 
   factory Team.fromJson(Map<String, dynamic> json) => Team(
-        id: json["_id"],
-        name: json["name"],
-        image: json["image"],
+        id: json["_id"] ?? "",
+        name: json["name"] ?? "",
+        image: json["image"] ?? "",
       );
 
   Map<String, dynamic> toJson() => {
diff --git a/lib/services/player_service.dart b/lib/services/player_service.dart
@@ -1,4 +1,8 @@
+// ignore_for_file: use_build_context_synchronously
+
 import 'dart:convert';
+import 'dart:developer';
+import 'dart:io';
 import '../exports/exports.dart';
 import '../models/handball_player_model.dart';
 import '../models/player.dart';
@@ -116,7 +120,6 @@ class PlayerService {
       }
     } on ClientException catch (e) {
       context.read<LoaderController>().isLoading = false;
-
       debugPrint(e.message);
     }
   }
@@ -208,6 +211,7 @@ class PlayerService {
 
   static void transferPlayer(Map<String, dynamic> data) async {
     try {
+      showLoader(text: "Recording transfer...");
       Response response = await Client().put(
         Uri.parse(
             "${Apis.transferPlayer + data['id']}/transferPlayer/${data['league']}"),
@@ -217,6 +221,7 @@ class PlayerService {
         },
       );
       if (response.statusCode == 200) {
+        Routes.popPage();
         showMessage(
             msg: "Player transferred successfully", color: Colors.green);
         Routes.popPage();
@@ -266,4 +271,42 @@ class PlayerService {
       return Future.error(false);
     }
   }
+
+  static Future<List<Message>> getTransferredPlayers(String leagueId) async {
+    try {
+      final response = await Client().get(
+        Uri.parse("${Apis.transferredPlayers}$leagueId/transferred"),
+      );
+      if (response.statusCode == 200) {
+        // log(response.body);
+        return playersModelFromJson(response.body).message;
+      } else {
+        return Future.error(jsonDecode(response.body)['message']);
+      }
+    } on ClientException catch (e) {
+      return Future.error(e.message);
+    } on SocketException catch (e) {
+      return Future.error(e.message);
+    } on HttpException catch (e) {
+      return Future.error(e.message);
+    }
+  }
+
+// delete transfer
+  static Future deleteTransfer(String id) async {
+    try {
+      showLoader(text: "Deleting transfer.....");
+      Response response = await Client().delete(
+        Uri.parse(Apis.deleteTransfer + id),
+      );
+      if (response.statusCode == 200) {
+        Routes.popPage();
+        return Future.value(json.decode(response.body)['message']);
+      } else {
+        return Future.error(jsonDecode(response.body)['message']);
+      }
+    } catch (e) {
+      return Future.error(e.toString());
+    }
+  }
 }
diff --git a/lib/tools/tools.dart b/lib/tools/tools.dart
@@ -31,8 +31,13 @@ void showAdaptive(Widget page) {
   showAdaptiveDialog(
     context: navigatorKey.currentContext!,
     barrierDismissible: false,
+    barrierColor: Theme.of(context).brightness == Brightness.light
+        ? null
+        : Colors.white38,
     traversalEdgeBehavior: TraversalEdgeBehavior.leaveFlutterView,
-    builder: (context) => Dialog(child: page),
+    builder: (context) => Dialog(
+      child: page,
+    ),
   );
 }
 
diff --git a/lib/views/pages/sections/transfers/transfer_player.dart b/lib/views/pages/sections/transfers/transfer_player.dart
@@ -0,0 +1,80 @@
+import '/models/player.dart';
+
+import '/exports/exports.dart';
+
+class TransferPlayer extends StatelessWidget {
+  final Message player;
+  const TransferPlayer({super.key, required this.player});
+
+  @override
+  Widget build(BuildContext context) {
+    return Card(
+      color: Theme.of(context).brightness == Brightness.light
+          ? Colors.grey.shade100
+          : Colors.white30,
+      elevation: 0,
+      shape: RoundedRectangleBorder(
+        borderRadius: BorderRadius.circular(10),
+        side: BorderSide(
+          color: Theme.of(context).brightness == Brightness.light
+              ? Colors.grey.shade300
+              : Colors.white54,
+          width: 1,
+        ),
+      ),
+      margin: const EdgeInsets.all(10),
+      child: Column(
+        children: [
+          FittedBox(
+            child: SizedBox(
+              width: MediaQuery.of(context).size.width,
+              height: 70,
+              child: ListTile(
+                leading: const CircleAvatar(
+                  child: Icon(Icons.person),
+                ),
+                title: Text(player.name),
+                trailing: Text(
+                  player.soldOut,
+                  style: const TextStyle(fontSize: 20),
+                ),
+              ),
+            ),
+          ),
+          FittedBox(
+            child: Padding(
+              padding: const EdgeInsets.fromLTRB(0, 3, 0, 10),
+              child: SizedBox(
+                width: MediaQuery.of(context).size.width,
+                height: 50,
+                child: Row(
+                  children: [
+                    Expanded(
+                      flex: 3,
+                      child: ListTile(
+                        leading: CircleAvatar(
+                          backgroundImage: NetworkImage(player.oldTeam.image),
+                        ),
+                        title: Text(player.oldTeam.name),
+                        trailing: const Icon(Icons.arrow_forward),
+                      ),
+                    ),
+                    Expanded(
+                      flex: 3,
+                      child: ListTile(
+                        leading: CircleAvatar(
+                          backgroundImage: NetworkImage(player.team.image),
+                        ),
+                        title: Text(player.team.name),
+                      ),
+                    ),
+                  ],
+                ),
+              ),
+            ),
+          )
+        ],
+      ),
+    );
+  }
+}
diff --git a/lib/views/pages/sections/transfers/transfer_widget.dart b/lib/views/pages/sections/transfers/transfer_widget.dart
@@ -43,22 +43,22 @@ class _TransferWidgetState extends State<TransferWidget> {
                   padding: EdgeInsets.fromLTRB(10, 7, 10, 0),
                   child: Divider(),
                 ),
-                InkWell(
-                  onTap: () {
+                CommonTextField(
+                  controller: newTeamController,
+                  titleText: "New Team",
+                  padding: const EdgeInsets.fromLTRB(10, 5, 10, 5),
+                  enableBorder: true,
+                  hintText: "New team's name appears here...",
+                  enableSuffix: true,
+                  suffixIcon: Icons.add_card,
+                  onTapSuffix: () {
                     showModalSheet(
                       ShowTransferTeams(
                         teamId: widget.leagueId,
                       ),
                     );
                   },
-                  child: CommonTextField(
-                    controller: newTeamController,
-                    titleText: "New Teams",
-                    padding: const EdgeInsets.fromLTRB(10, 5, 10, 5),
-                    enableBorder: true,
-                    hintText: "Enter new team name",
-                    readOnly: true,
-                  ),
+                  readOnly: true,
                 ),
                 CommonTextField(
                   controller: soldController,
diff --git a/lib/views/pages/sections/transfers/view_transfer.dart b/lib/views/pages/sections/transfers/view_transfer.dart
diff --git a/lib/views/pages/sections/widgets/league_options.dart b/lib/views/pages/sections/widgets/league_options.dart

Original file line number	Diff line number	Diff line change
`@@ -70,4 +70,7 @@ class Apis {`
`70`	`70`	`static String updateHandBallStats = "${apiUrl}handBall/update/";`
`71`	`71`	`static String deleteHandBallStats = "${apiUrl}handBall/delete/";`
`72`	`72`	`static String fetchHandBallPlayer = "${apiUrl}handBall/player/";`
	`73`	`+// transfers`
	`74`	`+ static String transferredPlayers = "${apiUrl}player/";`
	`75`	`+ static String deleteTransfer = "${apiUrl}player/deleteTransfer/";`
`73`	`76`	`}`