Merge pull request #251 from 12fahed/main

All bugs Resolved
TSEC-MAD-Club · Aug 2, 2024 · d90a14d · d90a14d
2 parents 00ed435 + a54bbc6
commit d90a14d
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 24 deletions.
diff --git a/lib/new_ui/screens/event_details_screen/event_details.dart b/lib/new_ui/screens/event_details_screen/event_details.dart
@@ -89,29 +89,46 @@ class _EventDetailState extends ConsumerState<EventDetail> {
                           Expanded(
                             child: Container(),
                           ),
-                          (data == null ||
-                                  (widget.eventModel.eventRegistrationUrl
-                                          .isEmpty ||
-                                      widget.eventModel.eventRegistrationUrl ==
-                                          ""))
-                              ? const SizedBox()
-                              : ElevatedButton(
-                                  onPressed: () {
-                                    launchUrl();
-                                  },
-                                  child: const Text(
-                                    "Register",
-                                    style: TextStyle(color: Colors.white, fontSize: 14),
-                                  ),
-                                  style: ElevatedButton.styleFrom(
-                                      backgroundColor: Colors.blue,
-                                    padding: const EdgeInsets.only(
-                                        top: 0, bottom: 0, right: 20, left: 20),
-                                    shape: RoundedRectangleBorder(
-                                      borderRadius: BorderRadius.circular(5),
-                                    ),
-                                  ),
-                                )
+                          // (data == null ||
+                          //         (widget.eventModel.eventRegistrationUrl
+                          //                 .isEmpty ||
+                          //             widget.eventModel.eventRegistrationUrl ==
+                          //                 ""))
+                          //     ? const SizedBox()
+                          //     : ElevatedButton(
+                          //         onPressed: () {
+                          //           launchUrl();
+                          //         },
+                          //         child: const Text(
+                          //           "Register",
+                          //           style: TextStyle(color: Colors.white, fontSize: 14),
+                          //         ),
+                          //         style: ElevatedButton.styleFrom(
+                          //             backgroundColor: Colors.blue,
+                          //           padding: const EdgeInsets.only(
+                          //               top: 0, bottom: 0, right: 20, left: 20),
+                          //           shape: RoundedRectangleBorder(
+                          //             borderRadius: BorderRadius.circular(5),
+                          //           ),
+                          //         ),
+                          //       )
+                          ElevatedButton(
+                            onPressed: () {
+                              launchUrl();
+                            },
+                            child: const Text(
+                              "Register",
+                              style: TextStyle(color: Colors.white, fontSize: 14),
+                            ),
+                            style: ElevatedButton.styleFrom(
+                              backgroundColor: Colors.blue,
+                              padding: const EdgeInsets.only(
+                                  top: 0, bottom: 0, right: 20, left: 20),
+                              shape: RoundedRectangleBorder(
+                                borderRadius: BorderRadius.circular(5),
+                              ),
+                            ),
+                          ),
                         ],
                       ),
                     ),

diff --git a/lib/utils/profile_details.dart b/lib/utils/profile_details.dart
@@ -117,7 +117,7 @@ List<String> calcBatchList(String? div, String? branch) {
   if (div == null) {
     return batches;
   }
-  if (branch == "Comps"){
+  if (branch == "Comps" || branch == "Extc"){
     for (int i = 1; i <= 4; i++) {
       batches.add("$div$i");
     }