Merge pull request #421 from sinfo/staging

Update 1.0.18
sinfo · Nov 28, 2023 · 826e5f5 · 826e5f5
2 parents e06c13a + de19ec4
commit 826e5f5
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 37 deletions.
diff --git a/frontend/lib/components/DisplayContactCompany.dart b/frontend/lib/components/DisplayContactCompany.dart
@@ -2,9 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:frontend/models/contact.dart';
 import 'package:frontend/models/company.dart';
 import 'package:frontend/components/EditContact.dart';
-import 'package:frontend/services/authService.dart';
 import 'package:frontend/services/contactService.dart';
-import 'package:provider/provider.dart';
 import 'InformationBox.dart';
 
 class DisplayContactsCompany extends StatefulWidget {
@@ -26,38 +24,26 @@ class _DisplayContactsState extends State<DisplayContactsCompany> {
  this.contact = contactService.getContact(widget.rep.contactID);
  }
 
- _isEditable(Contact cont) {
- return FutureBuilder(
- future: Provider.of<AuthService>(context).role,
- builder: (context, snapshot) {
- if (snapshot.hasData) {
- Role r = snapshot.data as Role;
-
- if (r == Role.ADMIN || r == Role.COORDINATOR || r == Role.MEMBER) {
- return FloatingActionButton.extended(
- onPressed: () async {
- final bool? shouldRefresh = await Navigator.push<bool>(
- context,
- MaterialPageRoute(
- builder: (context) =>
- EditContact(contact: cont, person: widget.rep),
- ),
- );
- if (shouldRefresh ?? false) {
- this.contact =
- contactService.getContact(widget.rep.contactID);
- setState(() {});
- }
- },
- label: const Text('Edit Contacts'),
- icon: const Icon(Icons.edit),
- backgroundColor: Color(0xff5C7FF2),
- );
- } else
- return Container();
- } else
- return Container();
- });
+ _isEditable(Contact cont) { 
+ return FloatingActionButton.extended(
+ onPressed: () async {
+ final bool? shouldRefresh = await Navigator.push<bool>(
+ context,
+ MaterialPageRoute(
+ builder: (context) =>
+ EditContact(contact: cont, person: widget.rep),
+ ),
+ );
+ if (shouldRefresh ?? false) {
+ this.contact =
+ contactService.getContact(widget.rep.contactID);
+ setState(() {});
+ }
+ },
+ label: const Text('Edit Contacts'),
+ icon: const Icon(Icons.edit),
+ backgroundColor: Color(0xff5C7FF2),
+ ); 
  }
 
  @override

diff --git a/frontend/lib/routes/company/CreateRep.dart b/frontend/lib/routes/company/CreateRep.dart
@@ -212,9 +212,8 @@ class _CreateRepState extends State<CreateRep> {
  final representative = _Reps[index];
  return ListTile(
  key: Key(representative.id.toString()),
- leading: Icon(Icons
- .person), // Add your representative image here
- title: Text(representative.name ?? 'N/A'),
+ leading: Icon(Icons.person), // Add your representative image here
+ title: SelectableText(representative.name),
  trailing: Row(
  mainAxisSize: MainAxisSize.min,
  children: [