Ultimos toques del sprint 3

fast_med_flutter/android/app/build.gradle

@@ -39,7 +39,7 @@ android {
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "com.example.fast_med_flutter"
-        minSdkVersion 16
+        minSdkVersion 23
         targetSdkVersion 29
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName

fast_med_flutter/lib/classes/language.dart

@@ -0,0 +1,17 @@
+class Language {
+  final int id;
+  final String flag;
+  final String name;
+  final String languageCode;
+
+  Language(this.id, this.flag, this.name, this.languageCode);
+
+  static List<Language> languageList() {
+    return <Language>[
+      Language(1, "🇦🇫", "فارسی", "fa"),
+      Language(2, "🇺🇸", "English", "en"),
+      Language(3, "🇺🇸", "Español", "es"),
+      Language(4, "🇮🇳", "हिंदी", "hi"),
+    ];
+  }
+}

fast_med_flutter/lib/languages/en.json

@@ -0,0 +1,15 @@
+{
+  "home_page": "Home Page",
+  "personal_information": "Personal Information",
+  "name": "Name",
+  "name_hint": "Enter your name",
+  "email": "Email",
+  "email_hint": "Enter your email",
+  "date_of_birth": "Date of Birth",
+  "required_field": "Required Field",
+  "submit_info": "Submit Info",
+  "about_us": "About Us",
+  "settings": "Settings",
+  "change_language": "Change Language",
+  "about": "This user story translate for our FastMed app in CCOM4030."
+}

fast_med_flutter/lib/languages/es.json

@@ -0,0 +1,15 @@
+{
+  "home_page": "Pagina Inicio",
+  "personal_information": "Informacion Personal",
+  "name": "Nombre",
+  "name_hint": "Entra tu nombre",
+  "email": "Correo electronico",
+  "email_hint": "Entra tu correo electronico",
+  "date_of_birth": "Fecha de nacimiento",
+  "required_field": "Campo requerido",
+  "submit_info": "Somete informacion",
+  "about_us": "Acerca de nosotros",
+  "settings": "Configuracion",
+  "change_language": "Cambia el lenguaje",
+  "about": "Este user story traduce para nuestro FastMed app en CCOM4030."
+}

fast_med_flutter/lib/localization/language_constants.dart

@@ -0,0 +1,42 @@
+import 'package:flutter/material.dart';
+import '../localization/localization.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+
+const String LAGUAGE_CODE = 'languageCode';
+
+//languages code
+const String ENGLISH = 'en';
+const String FARSI = 'fa';
+const String SPANISH = 'es';
+const String HINDI = 'hi';
+
+Future<Locale> setLocale(String languageCode) async {
+  SharedPreferences _prefs = await SharedPreferences.getInstance();
+  await _prefs.setString(LAGUAGE_CODE, languageCode);
+  return _locale(languageCode);
+}
+
+Future<Locale> getLocale() async {
+  SharedPreferences _prefs = await SharedPreferences.getInstance();
+  String languageCode = _prefs.getString(LAGUAGE_CODE) ?? "en";
+  return _locale(languageCode);
+}
+
+Locale _locale(String languageCode) {
+  switch (languageCode) {
+    case ENGLISH:
+      return Locale(ENGLISH, 'US');
+    case FARSI:
+      return Locale(FARSI, "IR");
+    case SPANISH:
+      return Locale(SPANISH, "SP");
+    case HINDI:
+      return Locale(HINDI, "IN");
+    default:
+      return Locale(ENGLISH, 'US');
+  }
+}
+
+String getTranslated(BuildContext context, String key) {
+  return DemoLocalization.of(context).translate(key);
+}

fast_med_flutter/lib/localization/localization.dart

@@ -0,0 +1,51 @@
+import 'dart:convert';
+
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+
+class DemoLocalization {
+  DemoLocalization(this.locale);
+
+  final Locale locale;
+  static DemoLocalization of(BuildContext context) {
+    return Localizations.of<DemoLocalization>(context, DemoLocalization);
+  }
+
+  Map<String, String> _localizedValues;
+
+  Future<void> load() async {
+    String jsonStringValues =
+    await rootBundle.loadString('lib/languages/${locale.languageCode}.json');
+    Map<String, dynamic> mappedJson = json.decode(jsonStringValues);
+    _localizedValues =
+        mappedJson.map((key, value) => MapEntry(key, value.toString()));
+  }
+
+  String translate(String key) {
+    return _localizedValues[key];
+  }
+
+  // static member to have simple access to the delegate from Material App
+  static const LocalizationsDelegate<DemoLocalization> delegate =
+  _DemoLocalizationsDelegate();
+}
+
+class _DemoLocalizationsDelegate
+    extends LocalizationsDelegate<DemoLocalization> {
+  const _DemoLocalizationsDelegate();
+
+  @override
+  bool isSupported(Locale locale) {
+    return ['en', 'es', 'fa', 'hi'].contains(locale.languageCode);
+  }
+
+  @override
+  Future<DemoLocalization> load(Locale locale) async {
+    DemoLocalization localization = new DemoLocalization(locale);
+    await localization.load();
+    return localization;
+  }
+
+  @override
+  bool shouldReload(LocalizationsDelegate<DemoLocalization> old) => false;
+}

fast_med_flutter/lib/main.dart

@@ -1,19 +1,28 @@
 import 'package:fast_med_flutter/routes/home.dart';
 import 'package:fast_med_flutter/routes/ver_oficinas.dart';
+import 'package:fast_med_flutter/routes/ver_oficina.dart';
 import 'package:fast_med_flutter/routes/calendario.dart';
 import 'package:fast_med_flutter/routes/main.dart';
 import 'package:fast_med_flutter/routes/register.dart';
 import 'package:fast_med_flutter/routes/welcome.dart';
+import 'package:fast_med_flutter/routes/album.dart';
 import 'package:flutter/material.dart';
+import 'package:fast_med_flutter/routes/especialidades.dart';
+import 'routes/translation.dart';
 
 void main() => runApp(MaterialApp(
-    initialRoute: '/home',
+    initialRoute: '/welcome',
     routes: {
       '/home': (context) => Home(),
       '/verOficinas': (context) => VerOficinas(),
+      '/ver/oficina': (context) => VerOficina(),
       '/calendario': (context) => Calendario(),
       '/welcome': (context) => WelcomePage(),
       '/register': (context) => RegisterPage(),
       '/MyApp': (context) => MyApp(),
+      '/album': (context) => album(),
+      '/especialidades': (context) => especialidades(),
+      '/translation': (context) => translation(),
+
     }
 ));

fast_med_flutter/lib/model/event.dart

@@ -0,0 +1,66 @@
+import 'package:firebase_helpers/firebase_helpers.dart';
+
+//En esta Area definimos todas las variables y parametros utilizadas en las
+//funciones de los otros files.
+
+//Son las mismas variables usadas para enviar al servidor y recibir de vuelta
+// a la aplicacion.
+
+class EventModel extends DatabaseItem{
+  final String id;
+  final String title;
+  final String description;
+  final DateTime eventDate;
+  final String name;
+  final String number;
+  final String reason;
+  final DateTime eventTime;
+
+
+  EventModel({this.id,this.title, this.description, this.eventDate, this.name, this.number, this.reason, this.eventTime}):super(id);
+
+  factory EventModel.fromMap(Map data) {
+    return EventModel(
+      title: data['title'],
+      description: data['description'],
+      name: data['name'],
+      number: data['number'],
+      reason: data['reason'],
+      eventDate: data['event_date'],
+      eventTime: data['event_time'],
+    );
+  }
+
+  factory EventModel.fromDS(String id, Map<String,dynamic> data) {
+    return EventModel(
+      id: id,
+      title: data['title'],
+      description: data['description'],
+      number: data['number'],
+      reason: data['reason'],
+      eventDate: data['event_date'].toDate(),
+      eventTime: data['event_time'].toTime(),
+    );
+  }
+
+  final Map<DateTime, List> _holidays = {
+    DateTime(2020, 11, 6): ['No Hay Citas'],
+    DateTime(2020, 11, 3): ['Dia Elecciones'],
+    DateTime(2020, 12, 25): ['Chrismas'],
+    DateTime(2020, 12, 31): ['Despedida del anyo nuevo'],
+  };
+
+
+  Map<String,dynamic> toMap() {
+    return {
+      "title":title,
+      "description": description,
+      "event_date":eventDate,
+      "id":id,
+      "name":name,
+      "number":number,
+      "reason":reason,
+      "event_time":eventTime,
+    };
+  }
+}

fast_med_flutter/lib/pages/about_page.dart

@@ -0,0 +1,26 @@
+import 'package:flutter/material.dart';
+import '../localization/language_constants.dart';
+
+class AboutPage extends StatefulWidget {
+  AboutPage({Key key}) : super(key: key);
+
+  @override
+  _AboutPageState createState() => _AboutPageState();
+}
+
+class _AboutPageState extends State<AboutPage> {
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        title: Text(getTranslated(context, 'about_us')),
+      ),
+      body: Container(
+        padding: EdgeInsets.all(20),
+        child: Center(
+          child: Text(getTranslated(context, 'about')),
+        ),
+      ),
+    );
+  }
+}

fast_med_flutter/lib/pages/home_page.dart

@@ -0,0 +1,217 @@
+import 'package:flutter/material.dart';
+import '../classes/language.dart';
+import '../localization/language_constants.dart';
+import '../routes/translation.dart';
+import '../router/route_constants.dart';
+
+class HomePage extends StatefulWidget {
+  HomePage({Key key}) : super(key: key);
+
+  @override
+  _HomePageState createState() => _HomePageState();
+}
+
+class _HomePageState extends State<HomePage> {
+  final GlobalKey<FormState> _key = GlobalKey<FormState>();
+  void _changeLanguage(Language language) async {
+    Locale _locale = await setLocale(language.languageCode);
+    translation.setLocale(context, _locale);
+  }
+
+  void _showSuccessDialog() {
+    showTimePicker(context: context, initialTime: TimeOfDay.now());
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        title: Text(getTranslated(context, 'home_page')),
+        actions: <Widget>[
+          Padding(
+            padding: const EdgeInsets.all(8.0),
+            child: DropdownButton<Language>(
+              underline: SizedBox(),
+              icon: Icon(
+                Icons.language,
+                color: Colors.white,
+              ),
+              onChanged: (Language language) {
+                _changeLanguage(language);
+              },
+              items: Language.languageList()
+                  .map<DropdownMenuItem<Language>>(
+                    (e) => DropdownMenuItem<Language>(
+                  value: e,
+                  child: Row(
+                    mainAxisAlignment: MainAxisAlignment.spaceAround,
+                    children: <Widget>[
+                      Text(
+                        e.flag,
+                        style: TextStyle(fontSize: 30),
+                      ),
+                      Text(e.name)
+                    ],
+                  ),
+                ),
+              )
+                  .toList(),
+            ),
+          ),
+        ],
+      ),
+      drawer: Drawer(
+        child: _drawerList(),
+      ),
+      body: Container(
+        padding: EdgeInsets.all(20),
+        child: _mainForm(context),
+      ),
+    );
+  }
+
+  Form _mainForm(BuildContext context) {
+    return Form(
+      key: _key,
+      child: Column(
+        children: <Widget>[
+          Container(
+            height: MediaQuery.of(context).size.height / 4,
+            child: Center(
+              child: Text(
+                getTranslated(context, 'personal_information'),
+                // DemoLocalization.of(context).translate('personal_information'),
+                textAlign: TextAlign.center,
+                style: TextStyle(
+                  fontSize: 30,
+                  fontWeight: FontWeight.bold,
+                ),
+              ),
+            ),
+          ),
+          TextFormField(
+            validator: (val) {
+              if (val.isEmpty) {
+                return getTranslated(context, 'required_field');
+                // return DemoLocalization.of(context).translate('required_fiedl');
+              }
+              return null;
+            },
+            decoration: InputDecoration(
+              border: OutlineInputBorder(),
+              labelText: getTranslated(context, 'name'),
+              hintText: getTranslated(context, 'name_hint'),
+            ),
+          ),
+          SizedBox(
+            height: 10,
+          ),
+          TextFormField(
+            validator: (val) {
+              if (val.isEmpty) {
+                return getTranslated(context, 'required_field');
+              }
+              return null;
+            },
+            decoration: InputDecoration(
+              border: OutlineInputBorder(),
+              labelText: getTranslated(context, 'email'),
+              hintText: getTranslated(context, 'email_hint'),
+            ),
+          ),
+          SizedBox(
+            height: 10,
+          ),
+          TextFormField(
+            decoration: InputDecoration(
+                border: OutlineInputBorder(),
+                hintText: getTranslated(context, 'date_of_birth')),
+            onTap: () async {
+              FocusScope.of(context).requestFocus(FocusNode());
+              await showDatePicker(
+                context: context,
+                initialDate: DateTime.now(),
+                firstDate: DateTime(DateTime.now().year),
+                lastDate: DateTime(DateTime.now().year + 20),
+              );
+            },
+          ),
+          SizedBox(
+            height: 10,
+          ),
+          MaterialButton(
+            onPressed: () {
+              if (_key.currentState.validate()) {
+                _showSuccessDialog();
+              }
+            },
+            height: 50,
+            shape: StadiumBorder(),
+            color: Theme.of(context).primaryColor,
+            child: Center(
+              child: Text(
+                getTranslated(context, 'submit_info'),
+                style: TextStyle(color: Colors.white, fontSize: 20),
+              ),
+            ),
+          )
+        ],
+      ),
+    );
+  }
+
+  Container _drawerList() {
+    TextStyle _textStyle = TextStyle(
+      color: Colors.white,
+      fontSize: 24,
+    );
+    return Container(
+      color: Theme.of(context).primaryColor,
+      child: ListView(
+        padding: EdgeInsets.zero,
+        children: <Widget>[
+          DrawerHeader(
+            child: Container(
+              height: 100,
+              child: CircleAvatar(),
+            ),
+          ),
+          ListTile(
+            leading: Icon(
+              Icons.info,
+              color: Colors.white,
+              size: 30,
+            ),
+            title: Text(
+              getTranslated(context, 'about_us'),
+              style: _textStyle,
+            ),
+            onTap: () {
+              // To close the Drawer
+              Navigator.pop(context);
+              // Navigating to About Page
+              Navigator.pushNamed(context, aboutRoute);
+            },
+          ),
+          ListTile(
+            leading: Icon(
+              Icons.settings,
+              color: Colors.white,
+              size: 30,
+            ),
+            title: Text(
+              getTranslated(context, 'settings'),
+              style: _textStyle,
+            ),
+            onTap: () {
+              // To close the Drawer
+              Navigator.pop(context);
+              // Navigating to About Page
+              Navigator.pushNamed(context, settingsRoute);
+            },
+          ),
+        ],
+      ),
+    );
+  }
+}

fast_med_flutter/lib/pages/not_found_page.dart

@@ -0,0 +1,24 @@
+import 'package:flutter/material.dart';
+
+class NotFoundPage extends StatefulWidget {
+  NotFoundPage({Key key}) : super(key: key);
+
+  @override
+  _NotFoundPageState createState() => _NotFoundPageState();
+}
+
+class _NotFoundPageState extends State<NotFoundPage> {
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        title: Text("Not Found"),
+      ),
+      body: Container(
+        child: Center(
+          child: Text("Sorry, We couldn't found your page"),
+        ),
+      ),
+    );
+  }
+}

fast_med_flutter/lib/pages/settings_page.dart

@@ -0,0 +1,54 @@
+import 'package:flutter/material.dart';
+import '../classes/language.dart';
+import '../localization/language_constants.dart';
+import '../routes/translation.dart';
+
+class SettingsPage extends StatefulWidget {
+  SettingsPage({Key key}) : super(key: key);
+
+  @override
+  _SettingsPageState createState() => _SettingsPageState();
+}
+
+class _SettingsPageState extends State<SettingsPage> {
+  void _changeLanguage(Language language) async {
+    Locale _locale = await setLocale(language.languageCode);
+    translation.setLocale(context, _locale);
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        title: Text(getTranslated(context, 'settings')),
+      ),
+      body: Container(
+        child: Center(
+            child: DropdownButton<Language>(
+              iconSize: 30,
+              hint: Text(getTranslated(context, 'change_language')),
+              onChanged: (Language language) {
+                _changeLanguage(language);
+              },
+              items: Language.languageList()
+                  .map<DropdownMenuItem<Language>>(
+                    (e) => DropdownMenuItem<Language>(
+                  value: e,
+                  child: Row(
+                    mainAxisAlignment: MainAxisAlignment.spaceAround,
+                    children: <Widget>[
+                      Text(
+                        e.flag,
+                        style: TextStyle(fontSize: 30),
+                      ),
+                      Text(e.name)
+                    ],
+                  ),
+                ),
+              )
+                  .toList(),
+            )),
+      ),
+    );
+  }
+}

fast_med_flutter/lib/res/event_firestore_service.dart

@@ -0,0 +1,6 @@
+import 'package:firebase_helpers/firebase_helpers.dart';
+import '../model/event.dart';
+
+DatabaseService<EventModel> eventDBS = DatabaseService<EventModel>
+  ("events",fromDS: (id,data) => EventModel.fromDS(id, data), toMap:
+    (event) => event.toMap());

fast_med_flutter/lib/router/custom_router.dart

@@ -0,0 +1,21 @@
+import 'package:flutter/material.dart';
+import '../pages/about_page.dart';
+import '../pages/home_page.dart';
+import '../pages/not_found_page.dart';
+import '../pages/settings_page.dart';
+import '../router/route_constants.dart';
+
+class CustomRouter {
+  static Route<dynamic> generatedRoute(RouteSettings settings) {
+    switch (settings.name) {
+      case homeRoute:
+        return MaterialPageRoute(builder: (_) => HomePage());
+      case aboutRoute:
+        return MaterialPageRoute(builder: (_) => AboutPage());
+      case settingsRoute:
+        return MaterialPageRoute(builder: (_) => SettingsPage());
+      default:
+        return MaterialPageRoute(builder: (_) => NotFoundPage());
+    }
+  }
+}

fast_med_flutter/lib/router/route_constants.dart

@@ -0,0 +1,3 @@
+const String homeRoute = "home";
+const String aboutRoute = "about";
+const String settingsRoute = "settings";

fast_med_flutter/lib/routes/OfficeScreen.dart

@@ -0,0 +1,60 @@
+import 'package:flutter/material.dart';
+import 'dart:convert';
+import 'Offices.dart';
+import 'appointments.dart';
+import 'package:flutter/foundation.dart';
+
+
+class OfficesScreen extends StatelessWidget {
+  final List<Offices> off;
+  Offices ofi;
+  // final Offices Of;
+  // final offlist = List<Offices>.generate(
+  //   2,
+  //       (i) => Offices(
+  //         'Office $i',
+  //         docs[i], spec[i], addrs[i],
+  //   ),
+  // );
+
+  var docs = ["Collazo", "Albizu"];
+  var spec = ["General", "Pediatra"];
+  var addrs = ["Bo. Montellano, Cayey", "Las Dalias, Mayagüez"];
+
+  //requiring the list of todos
+  OfficesScreen({Key key, @required this.off}) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    // print(docs[0]);
+
+    final offlist = List<Offices>.generate(
+      2,
+          (i) => Offices(
+            'Office $i',
+            // "sds", "gfdf", "fvfgv",
+            docs[i], spec[i], addrs[i]
+      ),
+    );
+    return Scaffold(
+
+      appBar: AppBar(
+        title: Text('Todos'),
+      ),
+      //passing in the ListView.builder
+      body: ListView.builder(
+        itemCount: offlist.length,
+        itemBuilder: (context, index) {
+          return ListTile(
+              title: Text(offlist[index].office),
+              onTap: (){
+                Navigator.push(context, MaterialPageRoute(builder: (context) => 
+                AppointmentPage(O: offlist[index])),
+                );
+              },
+          );
+        },
+      ),
+    );
+  }
+}

fast_med_flutter/lib/routes/Offices.dart

@@ -0,0 +1,69 @@
+// import 'package:flutter/material.dart';
+// import 'dart:convert';
+// import 'package:flutter/foundation.dart';
+// import 'OfficeScreen.dart';
+// import 'appointments.dart';
+//
+// class Officess {
+//   final String office;
+//   final String doctor;
+//   final String specialty;
+//   final String address;
+//
+//   Officess({this.office, this.doctor, this.specialty, this.address});
+//
+//   factory Officess.fromJson(Map<String, dynamic> json) {
+//     return Officess(
+//       office: json['office'],
+//       doctor: json['doctor'],
+//       specialty: json['id'],
+//       address: json['title'],
+//     );
+//   }
+// }
+
+class Offices {
+  final String office;
+  final String doctor;
+  final String specialty;
+  final String address;
+
+  var variable = 32;
+
+  var docs = ["Collazo", "Albizu"];
+  var spec = ["General", "Pediatra"];
+  var addrs = ["Bo. Montellano, Cayey", "Las Dalias, Mayagüez"];
+
+  Offices(this.office, this.doctor, this.specialty, this.address);
+
+
+}
+// var docs = List<String> ("juan", "pedro");
+
+
+// final off = List<Offices>.generate(
+//   2,
+//       (i) => Offices(
+//     'Office $i',
+//     docs[i], spec[i], addrs[i],
+//   ),
+// );
+
+
+
+
+
+
+// final off = List<Offices>.generate(
+//   2,
+//       (i) => Offices(
+//     'Office $i',
+//     docs[i],
+//     spec[i],
+//     addrs[i],
+//   ),
+// );
+
+
+
+

fast_med_flutter/lib/routes/album.dart

@@ -0,0 +1,85 @@
+import 'dart:async';
+import 'dart:convert';
+import 'dart:io';
+
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:http/http.dart' as http;
+
+Future<Oficina> fetchOficina() async {
+  final response =
+  await http.get('https://ada.uprrp.edu/~oniel.mendez2/json/getOficinas.php');
+
+  if (response.statusCode == 200) {
+    return Oficina.fromJson(jsonDecode(response.body));
+  } else {
+    throw Exception('Failed to load album');
+  }
+}
+
+class Oficina {
+  String id;
+  String name;
+
+  Oficina({this.id, this.name});
+
+  factory Oficina.fromJson(Map<String, dynamic> json) {
+    return Oficina (
+      id :json['id'],
+      name: json['name'],
+    );
+  }
+}
+
+
+Future<void> main() async {
+  runApp(album());
+}
+class album extends StatefulWidget {
+
+  album({Key key}) : super(key: key);
+
+  @override
+  _MyAppState2 createState() => _MyAppState2();
+}
+
+
+class _MyAppState2 extends State<album> {
+  Future<Oficina> futureOficina;
+
+  @override
+  void initState() {
+    super.initState();
+    futureOficina = fetchOficina();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return MaterialApp(
+      title: 'Fetch Data Example',
+      theme: ThemeData(
+        primarySwatch: Colors.blue,
+      ),
+      home: Scaffold(
+        appBar: AppBar(
+          title: Text('Fetch Data Example'),
+        ),
+        body: Center(
+          child: FutureBuilder<Oficina>(
+            future: futureOficina,
+            builder: (context, snapshot) {
+              if (snapshot.hasData) {
+                return Text(snapshot.data.name);
+              } else if (snapshot.hasError) {
+                return Text("${snapshot.error}");
+              }
+
+              // By default, show a loading spinner.
+              return CircularProgressIndicator();
+            },
+          ),
+        ),
+      ),
+    );
+  }
+}

fast_med_flutter/lib/routes/appointments.dart

@@ -0,0 +1,135 @@
+import 'package:flutter/cupertino.dart';
+import 'package:flutter_login/flutter_login.dart';
+import 'package:flutter/material.dart';
+import 'package:google_fonts/google_fonts.dart';
+import 'Offices.dart';
+import 'dynamic.dart';
+import 'Offices.dart';
+import 'OfficeScreen.dart';
+import 'package:flutter/foundation.dart';
+import 'package:http/http.dart' as http;
+
+//This page only works when called by other OfficeScreenPage()
+//Need to add the functionality to work on its own
+
+
+class AppointmentPage extends StatelessWidget {
+
+
+  final Offices O;
+  AppointmentPage({Key key, @required this.O}) :super(key: key);
+  // AppointmentPage({Key key, @required this.O}) : super(key: key);
+
+  // final String title;
+  //
+  // Future<http.Response> fetchAlbum() {
+  //   return http.get('https://ada.uprrp.edu/~hector.sierra/FastMed/API/API/getcitas.php');
+  // }
+
+
+
+  // List<dynamicWidget> listDynamic = [];
+  // List<String> data = [];
+  // Icon floatingIcon = new Icon(Icons.add);
+  //
+  // addDynamic() {
+  //   if (data.length != 0) {
+  //     floatingIcon = new Icon(Icons.add);
+  //     data = [];
+  //     listDynamic = [];
+  //     print('if');
+  //   }
+  //   setState(() {});
+  //   if (listDynamic.length >= 5) {
+  //     return;
+  //   }
+  //   listDynamic.add(new dynamicWidget());
+  // }
+  //
+
+  // var docs = ["Collazo", "Albizu"];
+  // var spec = ["General", "Pediatra"];
+  // var addrs = ["Bo. Montellano, Cayey", "Las Dalias, Mayagüez"];
+
+
+  @override
+  Widget card() {
+  return SizedBox(
+    width: 380,
+    height: 150,
+      child: Card(
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+            children: <Widget>[
+              ListTile(
+
+                leading: Icon(
+                  Icons.check,
+                  color: Colors.green,
+                  size: 60,
+              ),
+                title: Text( O.doctor + "\n" + O.specialty, textScaleFactor: 1.5,),
+                subtitle: Text(O.address, textScaleFactor: 1.45,),
+                trailing: Text("\n10:45 - 11:45      ", textScaleFactor: 1.30,),
+
+              ),
+              // ListTile(
+              //   leading: Icon(
+              //     Icons.check,
+              //     color: Colors.green,
+              //     size: 60,
+              //   ),
+              //   title: Text("Figueroa" + "\n" + "Gastrointerologo", textScaleFactor: 1.5,),
+              //   subtitle: Text("Las Dalias, Mayagüez", textScaleFactor: 1.45,),
+              //   trailing: Text("\n10:45 - 11:45      ", textScaleFactor: 1.30,),
+              //
+              // )
+           ],
+          ),
+        ),
+      );
+    }
+
+  @override
+  Widget build(BuildContext context) {
+    final height = MediaQuery.of(context).size.height;
+    return Scaffold(
+
+        body: Container(
+          height: height,
+          child:Container(
+            width: MediaQuery.of(context).size.width,
+            padding: EdgeInsets.symmetric(horizontal: 20),
+            // height: MediaQuery.of(context).size.height,
+            decoration: BoxDecoration(
+                borderRadius: BorderRadius.all(Radius.circular(4)),
+                boxShadow: [
+                  BoxShadow(
+                      color: Colors.white,
+                      offset: Offset(0,3),
+                      blurRadius: 5,
+                      spreadRadius: 2)
+                ]
+
+            ),
+            child: SingleChildScrollView(
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.center,
+                  mainAxisAlignment: MainAxisAlignment.center,
+                  children: <Widget> [
+                    SizedBox(
+                      height: 80,
+                    ),
+                    card(),
+                    SizedBox(
+                      height: 25,
+                    ),
+                    // card(docs[1], spec[1], addrs[1]),
+                  ],
+                )
+            ),
+          ),
+        )
+    );
+  }
+}

fast_med_flutter/lib/routes/calendario.dart

@@ -1,19 +1,36 @@
 import 'package:flutter/material.dart';
-import 'package:intl/date_symbol_data_local.dart';
+import 'package:fast_med_flutter/ui/pages/add_event.dart';
+import 'package:fast_med_flutter/ui/pages/view_event.dart';
 import 'package:table_calendar/table_calendar.dart';
+import 'package:http/http.dart' as http;
+
+import 'package:fast_med_flutter/model/event.dart';
+
+// Dias de Citas No Disponibles
 
-// Dias sin Citas Disponibles
 final Map<DateTime, List> _holidays = {
   DateTime(2020, 11, 6): ['No Hay Citas'],
   DateTime(2020, 11, 3): ['Dia Elecciones'],
-
+  DateTime(2020, 12, 25): ['Christmas'],
+  DateTime(2020, 12, 31): ['Despedida del anyo nuevo'],
+  DateTime(2021, 01, 01): ['Anyo Nuevo'],
 };
 
-void main() {
-  initializeDateFormatting().then((_) => runApp(Calendario()));
-}
+//Iniciar la Seccion de las Citas
+
+void main() async{
 
+  //Comunicacion con el servidor antes de iniciar el app
 
+  var url = 'https://ada.uprrp.edu/~jorge.lopez19/FastMed/API/InsertEvent.php';
+  WidgetsFlutterBinding.ensureInitialized();
+  final data = await http.post(url, body: {
+  });
+  runApp(Calendario());
+
+}
+
+//Inicio del Area de las Citas Disponibles
 
 class Calendario extends StatelessWidget {
   @override
@@ -23,56 +40,72 @@ class Calendario extends StatelessWidget {
       theme: ThemeData(
         primarySwatch: Colors.blue,
       ),
-      home: MyHomePage(title: 'Citas Disponibles'),
+      home: MyHomePage(),
+      routes: {
+        "add_event": (_) => AddEventPage(),
+      },
     );
   }
 }
 
-class MyHomePage extends StatefulWidget {
-  MyHomePage({Key key, this.title}) : super(key: key);
 
-  final String title;
+// Define el homepage para el area de citas
 
+class MyHomePage extends StatefulWidget {
   @override
   _MyHomePageState createState() => _MyHomePageState();
 }
 
-class _MyHomePageState extends State<MyHomePage> with TickerProviderStateMixin {
-  Map<DateTime, List> _events;
-  List _selectedEvents;
-  AnimationController _animationController;
-  CalendarController _calendarController;
+class _MyHomePageState extends State<MyHomePage> {
+  CalendarController _controller;
+  Map<DateTime, List<dynamic>> _events;
+  List<dynamic> _selectedEvents;
 
   @override
   void initState() {
     super.initState();
     final _selectedDay = DateTime.now();
-
+    _controller = CalendarController();
     _events = {
-
-      _selectedDay.add(Duration(days: 3)): Set.from([ 'Cita Cardiologo', 'Cita Dentista']).toList(),
-      _selectedDay.add(Duration(days: 22)): ['Cita Cardiologo', 'Cita Dentista'],
-
+      //Ejemplos de Citas Previamente Hechas de Prueba Para los Recordatorios
+      _selectedDay.add(Duration(days: 3)): Set.from(
+          [ 'Cita Cardiologo', 'Cita Dentista']).toList(),
+      _selectedDay.add(Duration(days: 22)): [
+        'Cita Cardiologo',
+        'Cita Dentista'
+      ],
     };
-
     _selectedEvents = _events[_selectedDay] ?? [];
-    _calendarController = CalendarController();
-
-    _animationController = AnimationController(
-      vsync: this,
-      duration: const Duration(milliseconds: 400),
-    );
+    void _onDaySelected(DateTime day, List events, List holidays) {
+      print('CALLBACK: _onDaySelected');
+      setState(() {
+        _selectedEvents = _events[_selectedDay] ?? [];
+      });
+    }
+  }
 
-    _animationController.forward();
+  Map<String, dynamic> encodeMap(Map<DateTime, dynamic> map) {
+    Map<String, dynamic> newMap = {};
+    map.forEach((key, value) {
+      newMap[key.toString()] = map[key];
+    });
+    return newMap;
   }
 
-  @override
-  void dispose() {
-    _animationController.dispose();
-    _calendarController.dispose();
-    super.dispose();
+  Map<DateTime, List<dynamic>> _groupEvents(List<EventModel> events) {
+    Map<DateTime, List<dynamic>> data = {};
+    events.forEach((event) {
+      DateTime date = DateTime(event.eventDate.year, event.eventDate.month,
+          event.eventDate.day, 12);
+      if (data[date] == null) data[date] = [];
+      data[date].add(event);
+    });
+    return data;
   }
 
+
+  @override
+//Marca en el calendario los dias que no esta disponibles para hacer horarios
   void _onDaySelected(DateTime day, List events, List holidays) {
     print('CALLBACK: _onDaySelected');
     setState(() {
@@ -80,268 +113,117 @@ class _MyHomePageState extends State<MyHomePage> with TickerProviderStateMixin {
     });
   }
 
-  void _onVisibleDaysChanged(DateTime first, DateTime last, CalendarFormat format) {
+  void _onVisibleDaysChanged(DateTime first, DateTime last,
+      CalendarFormat format) {
     print('CALLBACK: _onVisibleDaysChanged');
   }
 
-  void _onCalendarCreated(DateTime first, DateTime last, CalendarFormat format) {
+  void _onCalendarCreated(DateTime first, DateTime last,
+      CalendarFormat format) {
     print('CALLBACK: _onCalendarCreated');
   }
 
+//Definimos los detalles del area de las citas
   @override
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
-        title: Text(widget.title),
-      ),
-      body: Column(
-        mainAxisSize: MainAxisSize.max,
-        children: <Widget>[
-          // Switch out 2 lines below to play with TableCalendar's settings
-          //-----------------------
-          _buildTableCalendar(),
-          // _buildTableCalendarWithBuilders(),
-          const SizedBox(height: 8.0),
-          _buildButtons(),
-          const SizedBox(height: 8.0),
-          Expanded(child: _buildEventList()),
-        ],
-      ),
-    );
-  }
-  //Back button
-  Widget BackButton(BuildContext context){
-    return InkWell(
-      onTap: (){
-        Navigator.pop(context);
-      },
-      child: Row(
-          children: <Widget>[
-            Container(
-              padding: EdgeInsets.only(left: 0, top:10, bottom: 10),
-              child: Icon(Icons.arrow_back_ios, color: Colors.black),
-            ),
-            Text("Black",
-                style: TextStyle(fontSize: 12, fontWeight: FontWeight.w500))
-          ]
-      ),
-    );
-  }
-
-  // Simple TableCalendar configuration (using Styles)
-  Widget _buildTableCalendar() {
-    return TableCalendar(
-      calendarController: _calendarController,
-      events: _events,
-      holidays: _holidays,
-      startingDayOfWeek: StartingDayOfWeek.monday,
-      calendarStyle: CalendarStyle(
-        selectedColor: Colors.lightBlueAccent,
-        todayColor: Colors.blueAccent,
-        markersColor: Colors.brown,
-        outsideDaysVisible: false,
+        title: Text('Citas Disponibles'),
       ),
-      headerStyle: HeaderStyle(
-        formatButtonTextStyle: TextStyle().copyWith(color: Colors.white, fontSize: 15.0),
-        formatButtonDecoration: BoxDecoration(
-          color: Colors.lightBlue,
-          borderRadius: BorderRadius.circular(16.0),
-        ),
-      ),
-      onDaySelected: _onDaySelected,
-      onVisibleDaysChanged: _onVisibleDaysChanged,
-      onCalendarCreated: _onCalendarCreated,
-    );
-  }
-
-  // More advanced TableCalendar configuration (using Builders & Styles)
-  Widget _buildTableCalendarWithBuilders() {
-    return TableCalendar(
-      locale: 'pl_PL',
-      calendarController: _calendarController,
-      events: _events,
-      holidays: _holidays,
-      initialCalendarFormat: CalendarFormat.month,
-      formatAnimation: FormatAnimation.slide,
-      startingDayOfWeek: StartingDayOfWeek.sunday,
-      availableGestures: AvailableGestures.all,
-      availableCalendarFormats: const {
-        CalendarFormat.month: '',
-        CalendarFormat.week: '',
-      },
-      calendarStyle: CalendarStyle(
-        outsideDaysVisible: false,
-        weekendStyle: TextStyle().copyWith(color: Colors.blue),
-        holidayStyle: TextStyle().copyWith(color: Colors.blue),
-      ),
-      daysOfWeekStyle: DaysOfWeekStyle(
-        weekendStyle: TextStyle().copyWith(color: Colors.blue),
-      ),
-      headerStyle: HeaderStyle(
-        centerHeaderTitle: true,
-        formatButtonVisible: false,
-      ),
-      builders: CalendarBuilders(
-        selectedDayBuilder: (context, date, _) {
-          return FadeTransition(
-            opacity: Tween(begin: 0.0, end: 1.0).animate(_animationController),
-            child: Container(
-              margin: const EdgeInsets.all(4.0),
-              padding: const EdgeInsets.only(top: 5.0, left: 6.0),
-              color: Colors.green,
-              width: 100,
-              height: 100,
-              child: Text(
-                '${date.day}',
-                style: TextStyle().copyWith(fontSize: 16.0),
-              ),
-            ),
-          );
-        },
-        todayDayBuilder: (context, date, _) {
-          return Container(
-            margin: const EdgeInsets.all(4.0),
-            padding: const EdgeInsets.only(top: 5.0, left: 6.0),
-            color: Colors.amber,
-            width: 100,
-            height: 100,
-            child: Text(
-              '${date.day}',
-              style: TextStyle().copyWith(fontSize: 16.0),
-            ),
-          );
-        },
-        markersBuilder: (context, date, events, holidays) {
-          final children = <Widget>[];
-
-          if (events.isNotEmpty) {
-            children.add(
-              Positioned(
-                right: 1,
-                bottom: 1,
-                child: _buildEventsMarker(date, events),
-              ),
-            );
-          }
-
-          if (holidays.isNotEmpty) {
-            children.add(
-              Positioned(
-                right: -2,
-                top: -2,
-                child: _buildHolidaysMarker(),
+      body: StreamBuilder<List<EventModel>>(
+        // stream: eventDBS.streamList(),
+          builder: (context, snapshot) {
+            if (snapshot.hasData) {
+              List<EventModel> allEvents = snapshot.data;
+              if (allEvents.isNotEmpty) {
+                _events = _groupEvents(allEvents);
+              }
+            }
+
+            return SingleChildScrollView(
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: <Widget>[
+                  TableCalendar(
+                    events: _events,
+                    holidays: _holidays,
+                    initialCalendarFormat: CalendarFormat.month,
+                    calendarStyle: CalendarStyle(
+                        canEventMarkersOverflow: true,
+                        todayColor: Colors.orange,
+                        selectedColor: Theme
+                            .of(context)
+                            .primaryColor,
+                        todayStyle: TextStyle(
+                            fontWeight: FontWeight.bold,
+                            fontSize: 18.0,
+                            color: Colors.white)),
+                    headerStyle: HeaderStyle(
+                      centerHeaderTitle: true,
+                      formatButtonDecoration: BoxDecoration(
+                        color: Colors.orange,
+                        borderRadius: BorderRadius.circular(20.0),
+                      ),
+                      formatButtonTextStyle: TextStyle(color: Colors.white),
+                      formatButtonShowsNext: false,
+                    ),
+                    startingDayOfWeek: StartingDayOfWeek.monday,
+                    onVisibleDaysChanged: _onVisibleDaysChanged,
+                    onCalendarCreated: _onCalendarCreated,
+
+                    builders: CalendarBuilders(
+                      selectedDayBuilder: (context, date, events) =>
+                          Container(
+                              margin: const EdgeInsets.all(4.0),
+                              alignment: Alignment.center,
+                              decoration: BoxDecoration(
+                                  color: Theme
+                                      .of(context)
+                                      .primaryColor,
+                                  borderRadius: BorderRadius.circular(10.0)),
+                              child: Text(
+                                date.day.toString(),
+                                style: TextStyle(color: Colors.white),
+                              )),
+                      todayDayBuilder: (context, date, events) =>
+                          Container(
+                              margin: const EdgeInsets.all(4.0),
+                              alignment: Alignment.center,
+                              decoration: BoxDecoration(
+                                  color: Colors.orange,
+                                  borderRadius: BorderRadius.circular(10.0)),
+                              child: Text(
+                                date.day.toString(),
+                                style: TextStyle(color: Colors.white),
+                              )),
+                    ),
+                    calendarController: _controller,
+                  ),
+                  ..._selectedEvents.map((event) =>
+                      ListTile(
+                        title: Text(event.title),
+                        onTap: () {
+                          Navigator.push(
+                              context,
+                              MaterialPageRoute(
+                                  builder: (_) =>
+                                      EventDetailsPage(
+                                        event: event,
+                                      )));
+                        },
+                      )),
+                ],
               ),
             );
           }
-
-          return children;
-        },
-      ),
-      onDaySelected: (date, events, holidays) {
-        _onDaySelected(date, events, holidays);
-        _animationController.forward(from: 0.0);
-      },
-      onVisibleDaysChanged: _onVisibleDaysChanged,
-      onCalendarCreated: _onCalendarCreated,
-    );
-  }
-
-  Widget _buildEventsMarker(DateTime date, List events) {
-    return AnimatedContainer(
-      duration: const Duration(milliseconds: 300),
-      decoration: BoxDecoration(
-        shape: BoxShape.rectangle,
-        color: _calendarController.isSelected(date)
-            ? Colors.brown[500]
-            : _calendarController.isToday(date) ? Colors.brown : Colors.blue,
       ),
-      width: 16.0,
-      height: 16.0,
-      child: Center(
-        child: Text(
-          '${events.length}',
-          style: TextStyle().copyWith(
-            color: Colors.green,
-            fontSize: 12.0,
-          ),
-        ),
+      floatingActionButton: FloatingActionButton(
+        child: Icon(Icons.add),
+        onPressed: () => Navigator.pushNamed(context, 'add_event'),
       ),
     );
   }
+}
 
-  Widget _buildHolidaysMarker() {
-    return Icon(
-      Icons.add_box,
-      size: 20.0,
-      color: Colors.blueGrey,
-    );
-  }
-
-  Widget _buildButtons() {
-    final dateTime = _events.keys.elementAt(_events.length - 2);
-
-    return Column(
-      children: <Widget>[
-        Row(
-          mainAxisSize: MainAxisSize.max,
-          mainAxisAlignment: MainAxisAlignment.spaceEvenly,
-          children: <Widget>[
-            RaisedButton(
-              child: Text('Mes'),
-              onPressed: () {
-                setState(() {
-                  _calendarController.setCalendarFormat(CalendarFormat.month);
-                });
-              },
-            ),
-            RaisedButton(
-              child: Text('2 Semanas'),
-              onPressed: () {
-                setState(() {
-                  _calendarController.setCalendarFormat(CalendarFormat.twoWeeks);
-                });
-              },
-            ),
-            RaisedButton(
-              child: Text('Semana'),
-              onPressed: () {
-                setState(() {
-                  _calendarController.setCalendarFormat(CalendarFormat.week);
-                });
-              },
-            ),
-          ],
-        ),
-        const SizedBox(height: 8.0),
-        RaisedButton(
-          child: Text('Recuerde Cita ${dateTime.day}-${dateTime.month}-${dateTime.year}'),
-          onPressed: () {
-            _calendarController.setSelectedDay(
-              DateTime(dateTime.year, dateTime.month, dateTime.day),
-              runCallback: true,
-            );
-          },
-        ),
-      ],
-    );
-  }
 
 
-  Widget _buildEventList() {
-    return ListView(
-      children: _selectedEvents
-          .map((event) => Container(
-        decoration: BoxDecoration(
-          border: Border.all(width: 0.8),
-          borderRadius: BorderRadius.circular(12.0),
-        ),
-        margin: const EdgeInsets.symmetric(horizontal: 8.0, vertical: 4.0),
-        child: ListTile(
-          title: Text(event.toString()),
-          onTap: () => print('$event tapped!'),
-        ),
-      ))
-          .toList(),
-    );
-  }
-}

fast_med_flutter/lib/routes/dynamic.dart

@@ -0,0 +1,39 @@
+import 'package:flutter/material.dart';
+
+
+class dynamicWidget extends StatelessWidget {
+  TextEditingController Product = new TextEditingController();
+  TextEditingController Price = new TextEditingController();
+
+  @override
+  Widget build(BuildContext context) {
+
+    Widget card() {
+      return SizedBox(
+        width: 380,
+        height: 140,
+        child: Card(
+          child: Column(
+            mainAxisSize: MainAxisSize.min,
+            children: <Widget>[
+              const ListTile(
+
+                leading: Icon(
+                  Icons.check,
+                  color: Colors.green,
+                  size: 60,
+                ),
+                title: Text("\nVacunación\nDr. Jímenez", textScaleFactor: 1.15,),
+                subtitle: Text("Bo. Montellano, Cayey", textScaleFactor: 1.25,),
+                trailing: Text("\n10:45 - 11:45      ", textScaleFactor: 1.30,),
+
+              ),
+            ],
+          ),
+        ),
+      );
+    }
+
+  }
+
+}

fast_med_flutter/lib/routes/especialidades.dart

@@ -0,0 +1,109 @@
+import 'package:flutter/material.dart';
+import 'dart:convert';
+import 'package:json_table/json_table.dart';
+
+class SimpleTable extends StatefulWidget {
+  @override
+  _SimpleTableState createState() => _SimpleTableState();
+}
+
+class _SimpleTableState extends State<SimpleTable> {
+  final String jsonSample =
+      '[{"id":"0","name":"Dr.Collazo","Oficina":"A","Phone":"787-522-0123","Espe":"Dentist"},{"id":"1","name":"Dr.Lelolelo","Oficina":"B","Phone":"787-533-4567","Espe":"Dentist"},{"id":"2","name":"Dr.Pepo","Oficina":"C","Phone":"787-544-8910","Espe":"otorrinolaringologo"}]';
+  bool toggle = true;
+
+  @override
+  Widget build(BuildContext context) {
+    var json = jsonDecode(jsonSample);
+    return Scaffold(
+      body: Container(
+        padding: EdgeInsets.all(16.0),
+        child: toggle
+            ? Column(
+          children: [
+            JsonTable(
+              json,
+              showColumnToggle: true,
+              tableHeaderBuilder: (String header) {
+                return Container(
+                  padding: EdgeInsets.symmetric(
+                      horizontal: 8.0, vertical: 4.0),
+                  decoration: BoxDecoration(
+                      border: Border.all(width: 0.5),
+                      color: Colors.grey[300]),
+                  child: Text(
+                    header,
+                    textAlign: TextAlign.center,
+                    style: Theme.of(context).textTheme.display1.copyWith(
+                        fontWeight: FontWeight.w700,
+                        fontSize: 14.0,
+                        color: Colors.black87),
+                  ),
+                );
+              },
+              tableCellBuilder: (value) {
+                return Container(
+                  padding: EdgeInsets.symmetric(
+                      horizontal: 4.0, vertical: 2.0),
+                  decoration: BoxDecoration(
+                      border: Border.all(
+                          width: 0.5,
+                          color: Colors.grey.withOpacity(0.5))),
+                  child: Text(
+                    value,
+                    textAlign: TextAlign.center,
+                    style: Theme.of(context).textTheme.display1.copyWith(
+                        fontSize: 14.0, color: Colors.grey[900]),
+                  ),
+                );
+              },
+              allowRowHighlight: true,
+              rowHighlightColor: Colors.yellow[500].withOpacity(0.7),
+              paginationRowCount: 20,
+            ),
+            SizedBox(
+              height: 20.0,
+            ),
+            Text("Tabla Oficinas")
+          ],
+        )
+            : Center(
+          child: Text(getPrettyJSONString(jsonSample)),
+        ),
+      ),
+      floatingActionButton: FloatingActionButton(
+          child: Icon(Icons.grid_on),
+          onPressed: () {
+            setState(
+                  () {
+                toggle = !toggle;
+              },
+            );
+          }),
+    );
+  }
+
+  String getPrettyJSONString(jsonObject) {
+    JsonEncoder encoder = new JsonEncoder.withIndent('  ');
+    String jsonString = encoder.convert(json.decode(jsonObject));
+    return jsonString;
+  }
+}
+
+void main() => runApp(especialidades());
+
+class especialidades extends StatelessWidget {
+  @override
+  Widget build(BuildContext context) {
+    return MaterialApp(
+      title: 'Flutter Demo',
+      theme: ThemeData(
+        primarySwatch: Colors.blue,
+      ),
+      home: SimpleTable(),
+    );
+  }
+}
+
+
+

fast_med_flutter/lib/routes/home.dart

@@ -1,10 +1,14 @@
 import 'package:flutter/material.dart';
+import '../widgets/functions.dart';
 
 class Home extends StatefulWidget{
   @override
   _HomeState createState() => _HomeState();
 }
 
+
+
+
 class _HomeState extends State<Home>{
   @override
   Widget build(BuildContext context){
@@ -14,69 +18,17 @@ class _HomeState extends State<Home>{
         centerTitle: true,
       ),
       body: Center(
-        child: Column(
-          mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+        child: ListView(
+          //mainAxisAlignment: MainAxisAlignment.spaceEvenly,
           children: [
-            new FlatButton(
-              minWidth: 300.0,
-              height: 100.0,
-              onPressed: (){
-                Navigator.pushNamed(context, '/verOficinas');
-              },
-              child: Text('Ver Oficinas',
-                style: TextStyle(fontSize: 36),
-              ),
-              color: Colors.purple,
-
-            ),
-            new FlatButton(
-              minWidth: 300.0,
-              height: 100.0,
-              onPressed: (){
-                Navigator.pushNamed(context, '/calendario');
-              },
-              child: Text('Calendario',
-                style: TextStyle(fontSize: 36),
-              ),
-              color: Colors.purple,
-
-            ),
-            new FlatButton(
-              minWidth: 300.0,
-              height: 100.0,
-              onPressed: (){
-                Navigator.pushNamed(context, '/register');
-              },
-              child: Text('register',
-                style: TextStyle(fontSize: 36),
-              ),
-              color: Colors.purple,
-
-            ),
-            new FlatButton(
-              minWidth: 300.0,
-              height: 100.0,
-              onPressed: (){
-                Navigator.pushNamed(context, '/welcome');
-              },
-              child: Text('welcome',
-                style: TextStyle(fontSize: 36),
-              ),
-              color: Colors.purple,
-
-            ),
-            new FlatButton(
-              minWidth: 300.0,
-              height: 100.0,
-              onPressed: (){
-                Navigator.pushNamed(context, '/MyApp');
-              },
-              child: Text('MyApp',
-                style: TextStyle(fontSize: 36),
-              ),
-              color: Colors.purple,
-
-            ),
+            newButton(context,'/verOficinas','Ver Oficinas'),
+            spaceBetween(),
+            newButton(context,'/calendario','Calendario'),
+            spaceBetween(),
+            newButton(context,'/especialidades','especialidades'),
+            spaceBetween(),
+            newButton(context,'/translation','translation'),
+            spaceBetween(),
             ],
         ),
 

fast_med_flutter/lib/routes/navigation.dart

@@ -0,0 +1,88 @@
+
+import 'package:flutter_login/flutter_login.dart';
+import 'package:flutter/material.dart';
+import 'package:google_fonts/google_fonts.dart';
+import 'register.dart';
+import 'welcome.dart';
+import 'profileinfo.dart';
+import 'appointments.dart';
+import 'package:http/http.dart' as http;
+import 'OfficeScreen.dart';
+import 'Offices.dart';
+import 'package:fast_med_flutter/routes/home.dart';
+
+
+class NavigationPage extends StatefulWidget{
+
+  NavigationPage({Key key, this.title}) : super(key: key);
+  final String title;
+
+  @override
+  _NavigationPageState createState() => _NavigationPageState();
+}
+
+class _NavigationPageState extends State<NavigationPage>{
+
+
+  int _selectedIndex = 0;
+
+  static const TextStyle optionStyle = TextStyle(fontSize: 30, fontWeight: FontWeight.bold);
+
+  final _pageOptions = [
+    OfficesScreen(),
+    ProfilePage(),
+    Home()
+  ];
+
+  // static const List<Navigator> _widgetOptions = <Navigator>[
+  // //   Navigator.push(
+  // // context, MaterialPageRoute(builder: (context) => ProfilePage()));
+  // ];
+
+
+  // void _onItemTapped(int index) {
+  //   setState(() {
+  //     _selectedIndex = index;
+  //   });
+  // }
+  @override
+  Widget build(BuildContext context) {
+    final height = MediaQuery.of(context).size.height;
+    return Scaffold(
+      // appBar: AppBar(
+      //   title: Text("Title"),
+      // ),
+      body:  _pageOptions[_selectedIndex],
+      bottomNavigationBar: BottomNavigationBar(
+        onTap: (int index){
+          setState(() {
+            _selectedIndex = index;
+          });
+        },
+          selectedItemColor: Colors.red[800],
+        currentIndex: _selectedIndex,
+        // onTap: ,
+        // currentIndex: ,
+        // selectedItemColor: Colors.red, onTap: ,
+        //
+
+        items: [
+          BottomNavigationBarItem(icon: Icon(Icons.medical_services),
+              label: 'FastMed'),
+          BottomNavigationBarItem(icon: Icon(Icons.person_rounded),
+              label: 'Profile'),
+          BottomNavigationBarItem(icon: Icon(Icons.event_note_rounded),
+              label: 'Appointments')
+        ],
+
+      ),
+      // body: Container(
+      //
+      // ),
+    );
+    // TODO: implement build
+    throw UnimplementedError();
+  }
+
+
+}

fast_med_flutter/lib/routes/profileinfo.dart

@@ -0,0 +1,226 @@
+
+
+import 'package:flutter_login/flutter_login.dart';
+import 'package:flutter/material.dart';
+import 'package:google_fonts/google_fonts.dart';
+import 'register.dart';
+import 'package:http/http.dart' as http;
+
+
+
+class ProfilePage extends StatefulWidget{
+
+  ProfilePage({Key key, this.title}) : super(key: key);
+  final String title;
+
+  @override
+  _ProfilePageState createState() => _ProfilePageState();
+}
+
+class _ProfilePageState extends State<ProfilePage>{
+  TextEditingController first_name = new TextEditingController();
+  TextEditingController last_name = new TextEditingController() ;
+  TextEditingController country = new TextEditingController();
+  TextEditingController city = new TextEditingController();
+  TextEditingController phone = new TextEditingController();
+  TextEditingController healthcare = new TextEditingController();
+
+  // trying to create a an array of controllers
+  // final List<TextEditingController> controllers = List();
+  // controllers.add(first_name);
+
+  Future<List> clear_controllers() async {
+    first_name.text = "";
+    last_name.text = "";
+    country.text = "";
+    city.text = "";
+    phone.text = "";
+    healthcare.text = "";
+  }
+
+
+  _Notice(BuildContext context, String message, int r, int g, int b){
+    showDialog<void>(
+        context: context,
+        barrierDismissible: false,
+        barrierColor: Colors.transparent,
+
+        builder: (BuildContext context){
+          Future.delayed(Duration(seconds: 3), () {
+            Navigator.of(context).pop(true);
+          });
+
+          return Material(
+              color: Colors.transparent,
+              child: InkResponse(
+                child: Container(
+
+                  alignment: Alignment.bottomCenter,
+                  padding: EdgeInsets.only(bottom: 130),
+                  child: Text(
+                    message,
+                    style: TextStyle(fontSize: 20, color: Color.fromARGB(255, r, g, b)),),
+
+                ),
+              )
+          );  
+        }
+      );
+  }
+  Future<List> send_data() async {
+
+
+    var url = 'https://ada.uprrp.edu/~hector.sierra/FastMed/UpdateProfile.php';
+    final data = await http.post(url, body: {
+      "first_name": first_name.text,
+      "last_name": last_name.text,
+      "country": country.text,
+      "city": city.text,
+      "phone": phone.text,
+      "healthcare": healthcare.text,
+    });
+    print(data.body);
+    if("User not registered" == data.body){
+      _Notice(context, "Error, unable to update profile", 255, 0, 0);
+    }
+    else{
+      _Notice(context, "Profile Updated", 0, 255, 0);
+    }
+
+  }
+
+  Widget _BackButton(BuildContext context) {
+    return InkWell(
+      onTap: () {
+        Navigator.pop(context);
+      },
+      child: Row(
+          children: <Widget>[
+            Container(
+              padding: EdgeInsets.only(left: 0, top: 10, bottom: 10),
+              child: Icon(Icons.arrow_back_ios, color: Colors.black),
+            ),
+            Text("Back",
+                style: TextStyle(fontSize: 14, fontWeight: FontWeight.w500))
+          ]
+      ),
+    );
+  }
+
+
+  Widget _SubmitButton(BuildContext context) {
+    return InkResponse(
+      onTap: () {
+        send_data();
+        // clear_controllers();
+      },
+      child: Material(
+        borderRadius: BorderRadius.circular(30),
+        elevation: 3,
+        child: Container(
+          padding: EdgeInsets.symmetric(vertical: 10),
+          width: 250,
+          alignment: Alignment.center,
+          decoration: BoxDecoration(
+            color: Colors.red,
+            borderRadius: BorderRadius.circular(30),
+          ),
+
+          child: Text(
+            "Update",
+            style: TextStyle(fontSize: 22, color: Colors.white),
+          ),
+        ),
+      ),
+    );
+  }
+
+  Widget _Fills() {
+    return Column(
+        children: <Widget>[
+          _EntryField("First Name", first_name),
+          _EntryField("Last Name", last_name),
+          _EntryField("Country", country),
+          _EntryField("City", city),
+          _EntryField("Phone Number", phone),
+          _EntryField("Healthcare Provider", healthcare),
+        ]
+    );
+  }
+
+  Widget _EntryField(String title, TextEditingController controller,
+      {bool pass = false}) {
+    return Container(
+      padding: EdgeInsets.only(left: 0, top: 10, bottom: 10),
+      child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+
+          children: <Widget>[
+            Text(
+              title,
+              style: TextStyle(fontWeight: FontWeight.bold, fontSize: 18),
+            ),
+            SizedBox(
+                height: 30
+            ),
+            TextField(
+              controller: controller,
+              obscureText: pass,
+              decoration: InputDecoration(
+                border: (
+                    UnderlineInputBorder()
+                ),
+              ),
+            )
+          ]
+      ),
+
+    );
+  }
+
+
+
+  @override
+  Widget build(BuildContext context) {
+    final height = MediaQuery.of(context).size.height;
+    return Scaffold(
+        body: Container(
+          height: height,
+          child: Stack(
+
+            children: <Widget>[
+              Container(
+                  padding: EdgeInsets.symmetric(horizontal: 20),
+                  child: SingleChildScrollView(
+                    child: Column(
+                      crossAxisAlignment: CrossAxisAlignment.center,
+                      mainAxisAlignment: MainAxisAlignment.center,
+                      children: <Widget>[
+                        SizedBox(
+                          height: 60,
+                        ),
+                        _Fills(),
+                        //Add code to verify if password and confirm password match
+                        SizedBox(
+                          height: 80,
+                        ),
+                        _SubmitButton(context),
+                        SizedBox(
+                          height: 50,
+                        ),
+                        // ElevatedButton(
+                        //     onPressed: send_data, child: Text("Register")),
+                      ],
+                    ),
+                  )
+              ),
+              // Positioned(
+              //   top: 15, left: 20, child: _BackButton(context),
+              // ),
+            ],
+
+          ),
+        )
+    );
+  }
+}

fast_med_flutter/lib/routes/register.dart

@@ -1,13 +1,19 @@
+import 'dart:convert';
+
 import 'package:flutter_login/flutter_login.dart';
 import 'package:flutter/material.dart';
 import 'package:google_fonts/google_fonts.dart';
+import 'package:http/http.dart' as http;
+import 'dart:convert' as convert;
+
+
 
 //
 //Still to add: 
 //  Email verification, that the input has "@" and "."
-//  Send email and password to database
-//
-//
+//  Hash the passwords
+//  Allow users to login
+//  Verify password and confirm password match
 //
 
 class RegisterPage extends StatefulWidget{
@@ -20,48 +26,138 @@ class RegisterPage extends StatefulWidget{
 }
 
 class _RegisterPageState extends State<RegisterPage> {
+  // TextEditingController name = new TextEditingController();
+  TextEditingController email = new TextEditingController();
+  TextEditingController password = new TextEditingController() ;
+  TextEditingController confirmpass = new TextEditingController();
 
-  TextEditingController email;
-  TextEditingController password;
-  TextEditingController confirmpass;
 
-  // Future<List> send_data() async {
-  //   final data = await
-  // }
+  Future<List> send_data() async {
 
-  String _SamePass(){
-    if(password == confirmpass){
-      return "Same password";
+
+    var url = 'https://ada.uprrp.edu/~hector.sierra/FastMed/API/insertuser.php';
+    final data = await http.post(url, body: {
+        "email": email.text,
+        "password": password.text,
+      });
+    print(data.body);
+    if("user not registered" == data.body){
+      print("maybe we use this");
     }
-    else{
-      return "Different passwords";
+
+  }
+
+  bool _SamePass() {
+    if (password.text == confirmpass.text) {
+      return true;
+    }
+    else {
+      return false;
     }
   }
 
-  Widget _BackButton(BuildContext context){
+  _Alerts(BuildContext context){
+
+    TextEditingController msg = new TextEditingController();
+
+
+   //
+   //Useful code for adding pop up messages with animations
+   //
+   //
+
+    // Navigator.of(context).push(
+    //
+    //   PageRouteBuilder(
+    //       transitionDuration: Duration(seconds: 2),
+    //       pageBuilder: (context, animation, secAnimation ) => AlertDialog(
+    //         title: Text("Testing"),
+    //         elevation: 1,
+    //         backgroundColor: Colors.transparent,
+    //
+    //       ),
+    //       opaque: false,
+    //   )
+    //
+    // );
+
+    showDialog<void>(
+      context: context,
+      barrierDismissible: false,
+      barrierColor: Colors.transparent,
+
+      builder: (BuildContext context){
+        Future.delayed(Duration(seconds: 2), () {
+          Navigator.of(context).pop(true);
+        });
+
+        return Material(
+          color: Colors.transparent,
+          child: InkResponse(
+            child: Container(
+
+              alignment: Alignment.bottomCenter,
+              padding: EdgeInsets.only(bottom: 30),
+              child: Text(
+                  "Email address is already registered",
+                  style: TextStyle(fontSize: 18, color: Colors.red),),
+
+            ),
+          )
+        );
+
+        // return Banner(
+        //   location: BannerLocation.bottomEnd,
+        //   message: "Hello there",
+        //
+        // );
+
+        // // allows the message to disappear
+        // Future.delayed(Duration(seconds: 2), () {
+        //   Navigator.of(context).pop(true);
+        // });
+        // return AlertDialog(
+        //   buttonPadding: ,
+        //   title: Text("Testing"),
+        //   elevation: 1,
+        //   backgroundColor: Colors.transparent,
+        // );
+      }
+    );
+  }
+
+
+
+  Widget _BackButton(BuildContext context) {
     return InkWell(
-      onTap: (){
+      onTap: () {
         Navigator.pop(context);
       },
       child: Row(
-        children: <Widget>[
-          Container(
-            padding: EdgeInsets.only(left: 0, top: 10, bottom: 10),
-            child: Icon(Icons.arrow_back_ios, color: Colors.black),
-          ),
-          Text("Back",
-          style: TextStyle(fontSize: 12, fontWeight: FontWeight.w500))
-        ]
+          children: <Widget>[
+            Container(
+              padding: EdgeInsets.only(left: 0, top: 10, bottom: 10),
+              child: Icon(Icons.arrow_back_ios, color: Colors.black),
+            ),
+            Text("Back",
+                style: TextStyle(fontSize: 14, fontWeight: FontWeight.w500))
+          ]
       ),
     );
   }
 
-  Widget _SubmitButton(BuildContext context){
-    return InkWell(
-       onTap: (){
-
-       },
-      child: Container(
+  Widget _SubmitButton(BuildContext context) {
+    return InkResponse(
+      onTap: () {
+        send_data();
+        // _Alert(BuildContext);
+        // _Match(context);
+        _Alerts(context);
+      },
+      child: Material(
+        borderRadius: BorderRadius.circular(30),
+        elevation: 3,
+        child: Container(
         padding: EdgeInsets.symmetric(vertical: 10),
         width: 250,
         alignment: Alignment.center,
@@ -69,93 +165,110 @@ class _RegisterPageState extends State<RegisterPage> {
           color: Colors.red,
           borderRadius: BorderRadius.circular(30),
         ),
+
         child: Text(
           "Submit",
           style: TextStyle(fontSize: 22, color: Colors.white),
         ),
+        ),
       ),
     );
   }
 
-  Widget _EntryField(String title, TextEditingController controller, {bool pass = false}){
-    return Container(
-      padding: EdgeInsets.only(left: 0, top: 10, bottom: 10),
-      child: Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
-      
-        children: <Widget> [
-          Text(
-            title,
-            style: TextStyle(fontWeight: FontWeight.bold, fontSize: 15),
-          ),
-          SizedBox(
-            height: 30
-          ),
-          TextField(
-            controller: controller,
-            obscureText: pass,
-            decoration: InputDecoration(
-              border: (
-                  UnderlineInputBorder()
+    Widget _EntryField(String title, TextEditingController controller,
+        {bool pass = false}) {
+      return Container(
+        padding: EdgeInsets.only(left: 0, top: 10, bottom: 10),
+        child: Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+
+            children: <Widget>[
+              Text(
+                title,
+                style: TextStyle(fontWeight: FontWeight.bold, fontSize: 18),
               ),
-            ),
-          )
-        ]
-      ),
-      
-    );
-  }
+              SizedBox(
+                  height: 30
+              ),
+              TextField(
+                controller: controller,
+                obscureText: pass,
+                decoration: InputDecoration(
+                  border: (
+                      UnderlineInputBorder()
+                  ),
+                ),
+              )
+            ]
+        ),
 
-  Widget _Fills(){
-    return Column(
-      children: <Widget> [
-      _EntryField("Email", email),
-      _EntryField("Password", password, pass: true),
-      _EntryField("Confirm Password", confirmpass, pass: true)
-    
-    ]
-    );
-  }
+      );
+    }
 
-//add column or stack
-  @override
-  Widget build(BuildContext context) {
-    final height = MediaQuery.of(context).size.height;
-    return Scaffold(
-      body: Container(
-        height: height,
-        child: Stack(
-          
+    Widget _Fills() {
+      return Column(
           children: <Widget>[
-            Container(
-              padding: EdgeInsets.symmetric(horizontal: 20),
-              child: SingleChildScrollView(
-                child: Column(
-                  crossAxisAlignment: CrossAxisAlignment.center,
-                  mainAxisAlignment: MainAxisAlignment.center,
-                  children: <Widget>[
-                     SizedBox(
-                      height: 200,
-                    ),
-                    _Fills(),
-                    //Add code to verify if password and confirm password match
-                    SizedBox(
-                      height: 20,
-                    ),
-                    _SubmitButton(context),
-                  ],
+            _EntryField("Email", email),
+            _EntryField("Password", password, pass: true),
+            _EntryField("Confirm Password", confirmpass, pass: true)
+
+          ]
+      );
+    }
+
+//add column or stack
+    @override
+    Widget build(BuildContext context) {
+      final height = MediaQuery
+          .of(context)
+          .size
+          .height;
+      return Scaffold(
+          body: Container(
+            height: height,
+            child: Stack(
+
+              children: <Widget>[
+                Container(
+                    padding: EdgeInsets.symmetric(horizontal: 20),
+                    child: SingleChildScrollView(
+                      child: Column(
+                        crossAxisAlignment: CrossAxisAlignment.center,
+                        mainAxisAlignment: MainAxisAlignment.center,
+                        children: <Widget>[
+                          // Text("Username", style: TextStyle(fontSize: 18.0),),
+                          // TextField(
+                          //   controller: name,
+                          //   decoration: InputDecoration(
+                          //       hintText: 'name'
+                          //   ),
+                          // ),
+                          SizedBox(
+                            height: 100,
+                          ),
+                          _Fills(),
+                          //Add code to verify if password and confirm password match
+                          SizedBox(
+                            height: 20,
+                          ),
+                          _SubmitButton(context),
+                          SizedBox(
+                            height: 10,
+                          ),
+                          // ElevatedButton(
+                          //     onPressed: send_data, child: Text("Register")),
+                        ],
+                      ),
+                    )
                 ),
-              )
+                Positioned(
+                  top: 15, left: 20, child: _BackButton(context),
+                ),
+              ],
+
             ),
-            Positioned(
-            top: 12, left: 20, child: _BackButton(context),
-          ),
-          ],
-          
-        ),
-      )
-    );
+          )
+      );
+    }
   }
-    
-}
 

fast_med_flutter/lib/routes/translation.dart

@@ -0,0 +1,81 @@
+import 'package:flutter/material.dart';
+import '../localization/localization.dart';
+import '../router/custom_router.dart';
+import '../router/route_constants.dart';
+import 'package:flutter_localizations/flutter_localizations.dart';
+
+import '../localization/language_constants.dart';
+
+void main() => runApp(translation());
+
+class translation extends StatefulWidget {
+  const translation({Key key}) : super(key: key);
+  static void setLocale(BuildContext context, Locale newLocale) {
+    _MyAppState state = context.findAncestorStateOfType<_MyAppState>();
+    state.setLocale(newLocale);
+  }
+
+  @override
+  _MyAppState createState() => _MyAppState();
+}
+
+class _MyAppState extends State<translation> {
+  Locale _locale;
+  setLocale(Locale locale) {
+    setState(() {
+      _locale = locale;
+    });
+  }
+
+  @override
+  void didChangeDependencies() {
+    getLocale().then((locale) {
+      setState(() {
+        this._locale = locale;
+      });
+    });
+    super.didChangeDependencies();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    if (this._locale == null) {
+      return Container(
+        child: Center(
+          child: CircularProgressIndicator(
+              valueColor: AlwaysStoppedAnimation<Color>(Colors.blue[800])),
+        ),
+      );
+    } else {
+      return MaterialApp(
+        debugShowCheckedModeBanner: false,
+        title: "Flutter Localization Demo",
+        theme: ThemeData(primarySwatch: Colors.blue),
+        locale: _locale,
+        supportedLocales: [
+          Locale("en", "US"),
+          Locale("fa", "IR"),
+          Locale("es", "SP"),
+          Locale("hi", "IN")
+        ],
+        localizationsDelegates: [
+          DemoLocalization.delegate,
+          GlobalMaterialLocalizations.delegate,
+          GlobalWidgetsLocalizations.delegate,
+          GlobalCupertinoLocalizations.delegate,
+        ],
+        localeResolutionCallback: (locale, supportedLocales) {
+          for (var supportedLocale in supportedLocales) {
+            if (supportedLocale.languageCode == locale.languageCode &&
+                supportedLocale.countryCode == locale.countryCode) {
+              return supportedLocale;
+            }
+          }
+          return supportedLocales.first;
+        },
+        onGenerateRoute: CustomRouter.generatedRoute,
+        initialRoute: homeRoute,
+      );
+    }
+  }
+}

fast_med_flutter/lib/routes/ver_oficina.dart

@@ -0,0 +1,302 @@
+import 'package:flutter/material.dart';
+import '../widgets/DataTableMySqlDemo/Oficina.dart';
+import '../widgets/DataTableMySqlDemo/Horario.dart';
+import '../widgets/DataTableMySqlDemo/Especialista.dart';
+import '../widgets/DataTableMySqlDemo/Services.dart';
+import 'dart:async';
+import '../widgets/functions.dart';
+import 'package:flutter/material.dart';
+import 'package:url_launcher/url_launcher.dart';
+
+
+class VerOficina extends StatefulWidget{
+  VerOficina() : super();
+  final String title = 'Oficina';
+  @override
+  State<StatefulWidget> viewOficina() {
+    //no se que hago, quizas no lo necesite
+    return null;
+  }
+  _VerOficinaState createState() => _VerOficinaState();
+}
+
+class _VerOficinaState extends State<VerOficina>{
+  Map post = {};
+  List<Oficina> _oficina;
+  List<Horario> _horario;
+  List<Especialista> _especialista;
+
+  @override
+  void initState() {
+    super.initState();
+    _oficina = [];
+    _getOficina();
+    _horario = [];
+    _getHorario();
+    _especialista = [];
+    _getEspecialista();
+  }
+
+  _getOficina() {
+    return _oficina;
+  }
+  _getHorario() {
+    return _horario;
+  }
+  _getEspecialista() {
+    return _especialista;
+  }
+
+  //funcion
+  //recibe Horario para regresar la horas de entrada y salida
+  String getHoras(Horario horario) {
+    var open_time = horario.open_time;
+    var close_time = horario.close_time;
+    if (open_time == close_time
+        && open_time == '00:00:00'){
+        return 'Cerrado';
+    }
+    var open_hour = int.parse(open_time.substring(0,2));
+    var open_minutes = open_time.substring(3,5);
+    //var open_minutes;
+    var close_hour = int.parse(close_time.substring(0,2));
+    var close_minutes = open_time.substring(3,5);
+
+    // ver si la hora de abrir es AM o PM
+    if (open_hour==12){
+      open_time = open_time.substring(0,5) + ' PM';
+    }else if (open_hour>12){
+      open_time = (open_hour % 12).toString() + ':' + open_minutes + ' PM';
+    }else{
+      open_time = (open_hour % 12).toString() + ':' + open_minutes + ' AM';
+    }
+
+    // ver si la hora de cerrar es AM o PM
+    if (close_hour==12){
+      close_time = close_time.substring(0,5) + ' PM';
+    }else if (close_hour>12){
+      close_time = (close_hour % 12).toString() + ':' + close_minutes + ' PM';
+    }else{
+      close_time = (close_hour % 12).toString() + ':' + close_minutes + ' AM';
+    }
+
+    return open_time + ' - ' + close_time;
+  }
+  String getEspecialistas(List especialistas) {
+    if(especialistas.length > 0 && especialistas[0].specialty.toString() != 'null'){
+      var str = "";
+      especialistas.forEach((especialista){
+        str = str + especialista.specialty.toString() + '\n';
+      });
+      return str;
+    }
+    return "No hay especialistas";
+  }
+
+  @override
+  Widget build(BuildContext context){
+    post = ModalRoute.of(context).settings.arguments;
+    Services.getOficina(post['id']).then((Oficina) {
+      setState(() {
+        _oficina = Oficina;
+      });
+    });
+    Services.getHorario(post['id']).then((Horario) {
+      setState(() {
+        _horario = Horario;
+      });
+    });
+    Services.getEspecialista(post['id']).then((Especialista) {
+      setState(() {
+        _especialista = Especialista;
+      });
+    });
+
+
+    List<Oficina> lista =  _oficina;
+    var name = 'Cargando...';
+    var telephone = 'Cargando...';
+    var address = 'Cargando...';
+    var email = 'Cargando...';
+    if (lista.length > 0){
+      name = lista[0].name;
+      telephone = lista[0].telephone;
+      address = lista[0].address;
+      email = lista[0].email;
+    }
+
+    List<Horario> horario =  _horario;
+    var domingo_horario = 'Cargando...';
+    var lunes_horario = 'Cargando...';
+    var martes_horario = 'Cargando...';
+    var miercoles_horario = 'Cargando...';
+    var jueves_horario = 'Cargando...';
+    var viernes_horario = 'Cargando...';
+    var sabado_horario = 'Cargando...';
+    if(horario.length == 7){
+      domingo_horario = getHoras(horario[0]);
+      lunes_horario = getHoras(horario[1]);
+      martes_horario = getHoras(horario[2]);
+      miercoles_horario = getHoras(horario[3]);
+      jueves_horario = getHoras(horario[4]);
+      viernes_horario = getHoras(horario[5]);
+      sabado_horario = getHoras(horario[6]);
+    }else{
+      domingo_horario = 'Error';
+      lunes_horario = 'Error';
+      martes_horario = 'Error';
+      miercoles_horario = 'Error';
+      jueves_horario = 'Error';
+      viernes_horario = 'Error';
+      sabado_horario = 'Error';
+    }
+
+
+    List<Especialista> especialista =  _especialista;
+    var especialistas = getEspecialistas(especialista);
+
+    return Scaffold(
+      appBar: AppBar(
+        title: Text(name),
+        centerTitle: true,
+      ),
+      body: Center(
+        child: ListView(
+          //mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+          children: [
+            new Card(
+              color: Colors.red[300],
+
+              child: Column(
+                mainAxisSize: MainAxisSize.min,
+                children: <Widget>[
+                  ListTile(
+                    // leading: Icon(Icons.album),
+                    title: Text('Horario',style: TextStyle(fontWeight: FontWeight.bold,height: 2, fontSize: 36),textAlign: TextAlign.center),
+                    subtitle: Text(
+                        'Domingo: ' + '$domingo_horario'
+                        '\nLunes: ' + '$lunes_horario'
+                        '\nMartes: ' + '$martes_horario'
+                        '\nMiercoles: ' + '$miercoles_horario'
+                        '\nJueves: ' + '$jueves_horario'
+                        '\nViernes: ' + '$viernes_horario'
+                        '\nSabado: ' + '$sabado_horario',
+                        style: TextStyle(fontWeight: FontWeight.bold,height: 2, fontSize: 12),
+                        textAlign: TextAlign.center),
+                  ),
+                  Row(
+                    mainAxisAlignment: MainAxisAlignment.end,
+                    children: <Widget>[
+                      TextButton(
+                        child: const Text('Buscar Disponibilidad'),
+                        onPressed: () { /* ... */ },
+                      ),
+                      const SizedBox(width: 8),
+                    ],
+                  ),
+                ],
+              ),
+            ),
+            new Card(
+              color: Colors.red[300],
+
+              child: Column(
+                mainAxisSize: MainAxisSize.min,
+                children: <Widget>[
+                  Row(
+                    mainAxisAlignment: MainAxisAlignment.center,
+                    children: <Widget>[
+                      TextButton(
+                        child: const Text('Especialidades \ndisponibles',
+                            style: TextStyle(fontWeight: FontWeight.bold,height: 1.5, fontSize: 36),
+                            textAlign: TextAlign.center),
+                        onPressed: () { /* ... */ },
+                      ),
+                      const SizedBox(width: 8),
+                    ],
+                  ),
+                  ListTile(
+                    subtitle: Text(
+                        '$especialistas',
+                        style: TextStyle(fontWeight: FontWeight.bold,height: 2, fontSize: 12),
+                        textAlign: TextAlign.center),
+                  ),
+                ],
+              ),
+            ),
+            new Card(
+              color: Colors.red[300],
+
+              child: Column(
+                mainAxisSize: MainAxisSize.min,
+                children: <Widget>[
+                  ListTile(
+                    title: Text('Direccion',style: TextStyle(fontWeight: FontWeight.bold,height: 2, fontSize: 36),textAlign: TextAlign.center),
+                    subtitle: Text('$address',
+                        style: TextStyle(fontWeight: FontWeight.bold,height: 2, fontSize: 12),
+                        textAlign: TextAlign.center),
+                  ),
+                  Row(
+                    mainAxisAlignment: MainAxisAlignment.end,
+                    children: <Widget>[
+                      TextButton(
+                        child: const Text('Buscar en el mapa'),
+                        onPressed: () {
+                          setState(() async {
+                            String destinationLatitude = "18.39007092764153";
+                            String destinationLongitude = "-65.976216841223";
+                            String originlatitude = "18.418738017376207";
+                            String originlongitude = "-66.02565531285634";
+
+                            //const url = 'https://www.google.com/maps/@42.585444,13.007813,6z';
+                            const url = "https://www.google.com/maps/dir/?api=1&parameters&origin=18.418738017376207,-66.02565531285634&destination=18.39007092764153,-65.976216841223";
+                            if (await canLaunch(url)) {
+                              await launch(url);
+                            } else {
+                              throw 'Could not launch $url';
+                            }
+
+                            //String uri = "http://maps.google.com/maps?daddr=" + destinationLatitude + "," + destinationLongitude + " (" + "Doctor" + ")";
+                            //Intent intent;
+                            //intent.setAction(Action.ACTION_VIEW);
+                            //Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(uri));
+                            //intent.setPackage("com.google.android.apps.maps");
+                            //startActivity(intent);
+                            //UIApplication.shared.openURL(URL(string:"https://www.google.com/maps/@42.585444,13.007813,6z")!);
+                          });
+                          },
+                      ),
+                      const SizedBox(width: 8),
+                    ],
+                  ),
+                ],
+              ),
+            ),
+            new Card(
+              color: Colors.red[300],
+
+              child: Column(
+                mainAxisSize: MainAxisSize.min,
+                children: <Widget>[
+                  ListTile(
+                    title: Text('Contacto',style: TextStyle(fontWeight: FontWeight.bold,height: 2, fontSize: 36),textAlign: TextAlign.center),
+                    subtitle: Text("Telefono: \n "
+                        "$telephone \n "
+                        "\n"
+                        "Email:  \n  "
+                        "$email",
+                        style: TextStyle(fontWeight: FontWeight.bold,height: 2, fontSize: 12),
+                        textAlign: TextAlign.center),
+                  ),
+                ],
+              ),
+            ),
+          ],
+        ),
+
+      ),
+
+    );
+  }
+}
+

fast_med_flutter/lib/routes/ver_oficinas.dart

@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 import '../widgets/DataTableMySqlDemo/Oficina.dart';
 import '../widgets/DataTableMySqlDemo/Services.dart';
 import 'dart:async';
+import '../widgets/functions.dart';
 
 class VerOficinas extends StatefulWidget{
   VerOficinas() : super();
@@ -58,34 +59,21 @@ class _VerOficinasState extends State<VerOficinas>{
         backgroundColor: Colors.purple,
 
       ),
-      body: Center(
-          child: Column(
-            mainAxisAlignment: MainAxisAlignment.spaceEvenly,
-            children: lista.map((Oficina data) {
-              return FlatButton(
-                minWidth: 300.0,
-                height: 100.0,
-                child: Text(data.name,
-                style: TextStyle(fontSize: 36),
-                ),
-                onPressed: () {
-                  print(data.name);
-                },
-                padding: new EdgeInsets.all(0.0),
-                color: Colors.purple,
-
-              );
-            }).toList(),
-          ),
-          // child: FlatButton(
-          //   onPressed: (){
-          //     _getOficinas();
-          //   },
-          //   child: Text('Ver Oficinas'),
-          //   color: Colors.purple,
-          // )
+      body: ListView.builder(
+        itemCount: lista.length,
+        itemBuilder: (context, index){
+          return Card(
+          child: ListTile(
+            onTap: () {
+              Navigator.pushNamed(context, "/ver/oficina", arguments:{
+                'id' : lista[index].id,
+              });
+            },
+            title: Text(lista[index].name),
+          )
+          );
+        }
       ),
-
     );
   }
 }

fast_med_flutter/lib/routes/welcome.dart

@@ -1,10 +1,14 @@
-
-
+import 'dart:convert';
+// import 'dart:html';
+import 'dart:io';
+import 'package:flutter/cupertino.dart';
 import 'package:flutter_login/flutter_login.dart';
 import 'package:flutter/material.dart';
 import 'package:google_fonts/google_fonts.dart';
 import 'register.dart';
-
+import 'package:http/http.dart' as http;
+import 'dart:convert' as convert;
+import 'navigation.dart';
 
 
 
@@ -19,9 +23,34 @@ class WelcomePage extends StatefulWidget {
 }
 
 class _WelcomePageState extends State<WelcomePage> {
+  var Token;
+  TextEditingController email = new TextEditingController();
+  TextEditingController password = new TextEditingController();
+
+
+  Future<List> send_data() async {
+
+    var url = 'https://ada.uprrp.edu/~hector.sierra/FastMed/API/login.php';
+    http.Response response = await http.post(url, body: {
+      "email": email.text,
+      "password": password.text,
+    });
+    print(response.body);
+    print(response.statusCode);
+    print(HttpStatus.ok);
+    if("user not found" == response.body){
+      print("maybe we use this");
+    }
+    else{
+      print("User found");
+      Token = email.text;
+
+      Navigator.push(
+          context, MaterialPageRoute(builder: (context) => NavigationPage()));
+
+    }
+  }
 
-  TextEditingController email;
-  TextEditingController password;
 
   Widget _message(BuildContext context){
     return RichText(
@@ -59,7 +88,7 @@ class _WelcomePageState extends State<WelcomePage> {
           children: <Widget> [
             Text(
               title,
-              style: TextStyle(fontWeight: FontWeight.bold, fontSize: 15),
+              style: TextStyle(fontWeight: FontWeight.bold, fontSize: 18),
             ),
             SizedBox(
                 height: 30
@@ -81,6 +110,8 @@ class _WelcomePageState extends State<WelcomePage> {
     );
   }
 
+
+
   Widget _Fills(){
     return Column(
         children: <Widget> [
@@ -93,31 +124,31 @@ class _WelcomePageState extends State<WelcomePage> {
 
 
 
-  // Widget _LogInButton(BuildContext context){
-  //   return InkWell(
-  //     // onTap: () {
-  //     //   Navigator.push(context, MaterialPageRoute(builder: (context)) => __LoginPage())
-  //     // },
-  //     child: Container(
-  //       // width: MediaQuery.of(context).size.width,
-  //       width: 200,
-  //       // height: ,
-  //       padding: EdgeInsets.symmetric(vertical:8),
-  //       alignment: Alignment.center,
-  //       decoration: BoxDecoration(
-  //         color: Colors.red,
-  //         // shape:
-  //
-  //         borderRadius: BorderRadius.circular(30),
-  //       ),
-  //       child: Text(
-  //         "Login",
-  //         style: TextStyle(fontSize: 25, color: Colors.white),
-  //       ),
-  //
-  //     )
-  //   );
-  // }
+
+  Widget _SubmitButton(BuildContext context){
+    return InkResponse(
+      onTap: (){
+
+        send_data();
+
+
+      },
+      child: Container(
+        padding: EdgeInsets.symmetric(vertical: 10),
+        width: 180,
+        alignment: Alignment.center,
+        decoration: BoxDecoration(
+          color: Colors.red,
+          borderRadius: BorderRadius.circular(30),
+        ),
+        child: Text(
+          "Login",
+          style: TextStyle(fontSize: 22, color: Colors.white),
+        ),
+      ),
+    );
+  }
+
 
   Widget _RegisterButton(BuildContext context){
     return InkWell(
@@ -183,13 +214,17 @@ class _WelcomePageState extends State<WelcomePage> {
                     SizedBox(
                       height: 60,
                     ),
+                    _SubmitButton(context),
+                    SizedBox(
+                      height: 45,
+                    ),
                     _message(context),
                     SizedBox(
-                      height: 10,
+                      height: 15,
                     ),
                     _RegisterButton(context),
                     SizedBox(
-                      height: 10,
+                      height: 20,
                     )
                   ],
                 )

fast_med_flutter/lib/ui/pages/add_event.dart

@@ -0,0 +1,231 @@
+import 'package:fast_med_flutter/model/event.dart';
+import 'package:flutter/material.dart';
+import 'package:fast_med_flutter/res/event_firestore_service.dart';
+import 'package:http/http.dart' as http;
+import 'dart:async';
+
+class AddEventPage extends StatefulWidget {
+  final EventModel note;
+
+  const AddEventPage({Key key, this.note}) : super(key: key);
+
+  @override
+  _AddEventPageState createState() => _AddEventPageState();
+}
+
+//Controles de cada Evento que usaremos en todos los files
+
+class _AddEventPageState extends State<AddEventPage> {
+  TextStyle style = TextStyle(fontFamily: 'Montserrat', fontSize: 20.0);
+  TextEditingController _title;
+  TextEditingController _description;
+  TextEditingController _number;
+  TextEditingController _name;
+  TextEditingController _reason;
+
+
+  DateTime _eventDate;
+  DateTime _eventTime;
+  DateTime selectedDate = DateTime.now();
+  List data;
+  List holidays;
+  final _formKey = GlobalKey<FormState>();
+  final _key = GlobalKey<ScaffoldState>();
+  bool processing;
+
+  @override
+  void initState() {
+    super.initState();
+    _title = TextEditingController(text: widget.note != null ? widget.note.title : "");
+    _description = TextEditingController(text:  widget.note != null ? widget.note.description : "");
+    _name = TextEditingController(text:  widget.note != null ? widget.note.name : "");
+    _number = TextEditingController(text:  widget.note != null ? widget.note.number : "");
+    _reason = TextEditingController(text:  widget.note != null ? widget.note.reason : "");
+    _eventDate = DateTime.now();
+    _eventTime = DateTime.now();
+    processing = false;
+  }
+
+// Definimos el Formulario con cada parametro para crear la cita
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        title: Text(widget.note != null ? "Edit Note" : "Crear Su Cita"),
+      ),
+      key: _key,
+      body: Form(
+        key: _formKey,
+        child: Container(
+          alignment: Alignment.center,
+          child: ListView(
+            children: <Widget>[
+
+              // Area donde paciente anota su nombre. Si esta vacio no lo acepta.
+
+              Padding(
+                padding: const EdgeInsets.symmetric(horizontal: 16.0, vertical: 8.0),
+                child: TextFormField(
+                  controller: _name,
+                  validator: (value) =>
+                      (value.isEmpty) ? "Favor Anotar Nombre del Paciente" : null,
+                  style: style,
+                  decoration: InputDecoration(
+                      labelText: "Nombre completo del paciente",
+                      filled: true,
+                      fillColor: Colors.white,
+                      border: OutlineInputBorder(borderRadius: BorderRadius.circular(10))),
+                ),
+              ),
+
+              //Area donde el paciente debe anotar su numero de telefono. Si esta vacio no lo acepta.
+
+              Padding(
+                padding: const EdgeInsets.symmetric(horizontal: 16.0, vertical: 8.0),
+                child: TextFormField(
+                  controller: _number,
+                  validator: (value) =>
+                  (value.isEmpty) ? "Favor Anotar Numero de Telefono" : null,
+                  style: style,
+                  decoration: InputDecoration(
+                      labelText: "Numero de Telefono",
+                      border: OutlineInputBorder(borderRadius: BorderRadius.circular(10))),
+                ),
+              ),
+
+              //Area donde el paciente explica la razon de su cita medica. Si esta vacio no lo acepta
+
+              Padding(
+                padding: const EdgeInsets.symmetric(horizontal: 16.0, vertical: 8.0),
+                child: TextFormField(
+                  controller: _reason,
+                  minLines: 3,
+                  maxLines: 5,
+                  validator: (value) =>
+                      (value.isEmpty) ? "Favor Explicar Razon Para La Cita" : null,
+                  style: style,
+                  decoration: InputDecoration(
+                      labelText: "Razones para su cita",
+                      border: OutlineInputBorder(borderRadius: BorderRadius.circular(10))),
+                ),
+              ),
+              const SizedBox(height: 10.0),
+
+              //Area donde el paciente puede cambiar la fecha para la cita
+
+              ListTile(
+                title: Text("Date (YYYY-MM-DD)"),
+                subtitle: Text("${_eventDate.year} - ${_eventDate.month} - ${_eventDate.day}"),
+                onTap: ()async{
+                  DateTime picked = await showDatePicker(context: context, initialDate: _eventDate, firstDate: DateTime(_eventDate.year-5), lastDate: DateTime(_eventDate.year+5));
+                  if(picked != null) {
+                    setState(() {
+                      _eventDate = picked;
+                    });
+                  }
+                },
+              ),
+
+              //Area donde el paciente puede elegir y cambiar la hora para la cita
+
+              ListTile(
+                title: Text("Time (HH: mm)"),
+                subtitle: Text("${_eventDate.hour} - ${_eventDate.minute} - ${_eventDate.second}"),
+                onTap: ()async{
+                 final selectedTime = await _selectTime(context);
+                 if (selectedTime == null) return;
+                  print(selectedTime);
+
+                setState(() {
+                this.selectedDate = DateTime(
+                selectedTime.hour,
+                selectedTime.minute,
+                );
+                    });
+                  }
+                  ),
+              SizedBox(height: 10.0),
+
+              //Se define el envio de los parametros al usar el boton de Crear la Cita
+
+              processing
+                  ? Center(child: CircularProgressIndicator())
+                  : Padding(
+                padding: const EdgeInsets.symmetric(horizontal: 16.0),
+                child: Material(
+                  elevation: 5.0,
+                  borderRadius: BorderRadius.circular(30.0),
+                  color: Theme.of(context).primaryColor,
+                  child: MaterialButton(
+                    onPressed: () async {
+                      if (_formKey.currentState.validate()) {
+                        setState(() {
+                          processing = true;
+                        });
+                        if(widget.note != null) {
+                          await eventDBS.updateData(widget.note.id,{
+
+
+                          "title": _title.text,
+                          "number": _number.text,
+                          "reason": _reason.text,
+                          "event_date": widget.note.eventDate,
+                          "time": widget.note.eventTime,
+                          });
+                        }else{
+                          await eventDBS.createItem(EventModel(
+                              title: _title.text,
+                              description: _description.text,
+                              name: _name.text,
+                              number: _number.text,
+                              reason: _reason.text,
+                              eventDate: _eventDate
+
+                          ));
+                        }
+                        Navigator.pop(context);
+                        setState(() {
+                          processing = false;
+                        });
+                      }
+                    },
+                    child: Text(
+                      "Crear Su Cita Ahora",
+                      style: style.copyWith(
+                          color: Colors.white,
+                          fontWeight: FontWeight.bold),
+                    ),
+                  ),
+                ),
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+
+
+  @override
+  void dispose() {
+    _title.dispose();
+    _description.dispose();
+    _name.dispose();
+    _number.dispose();
+    _reason.dispose();
+    super.dispose();
+  }
+}
+
+// Funcionalidades para poder seleccionar horarios
+
+Future<TimeOfDay> _selectTime(BuildContext context) {
+  final now = DateTime.now();
+
+  return showTimePicker(
+    context: context,
+    initialTime: TimeOfDay(hour: now.hour, minute: now.minute),
+  );
+}
+

fast_med_flutter/lib/ui/pages/view_event.dart

@@ -0,0 +1,30 @@
+import 'package:flutter/material.dart';
+import 'package:fast_med_flutter/model/event.dart';
+
+// Implementacion para ver recordatorios de citas creadas
+
+class EventDetailsPage extends StatelessWidget {
+  final EventModel event;
+
+  const EventDetailsPage({Key key, this.event}) : super(key: key);
+
+  @override
+  Widget build(BuildContext context){
+    return Scaffold(
+      appBar: AppBar(
+        title: Text('Note details'),
+      ),
+      body: SingleChildScrollView(
+        padding: const EdgeInsets.all(16.0),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: <Widget>[
+            Text(event.title, style: Theme.of(context).textTheme.display1,),
+            SizedBox(height: 20.0),
+            Text(event.description)
+          ],
+        ),
+      ),
+    );
+  }
+}

fast_med_flutter/lib/widgets/DataTableMySqlDemo/Especialista.dart

@@ -0,0 +1,32 @@
+class Especialista {
+  String id;
+  String oficina_id;
+  String name;
+  String specialty;
+  String telephone;
+  String email;
+
+  Especialista({this.id, this.oficina_id, this.name, this.specialty, this.telephone, this.email});
+
+  factory Especialista.allFromJson(Map<String, dynamic> json) {
+    return Especialista (
+      id :json['id'] as String,
+      oficina_id: json['oficina_id'] as String,
+      name: json['name'] as String,
+      specialty: json['specialty'] as String,
+      telephone: json['telephone'] as String,
+      email: json['email'] as String,
+    );
+  }
+
+  factory Especialista.infoFromJson(Map<String, dynamic> json) {
+    return Especialista (
+      id :json['id'] as String,
+      oficina_id: json['oficina_id'] as String,
+      name: json['name'] as String,
+      specialty: json['specialty'] as String,
+      telephone: json['telephone'] as String,
+      email: json['email'] as String,
+    );
+  }
+}

fast_med_flutter/lib/widgets/DataTableMySqlDemo/Horario.dart

@@ -0,0 +1,29 @@
+class Horario {
+  String id;
+  String oficina_id;
+  String dia_semana;
+  String open_time;
+  String close_time;
+
+  Horario({this.id, this.oficina_id, this.dia_semana, this.open_time, this.close_time});
+
+  factory Horario.allFromJson(Map<String, dynamic> json) {
+    return Horario (
+      id :json['id'] as String,
+      oficina_id: json['oficina_id'] as String,
+      dia_semana: json['dia_semana'] as String,
+      open_time: json['open_time'] as String,
+      close_time: json['close_time'] as String,
+    );
+  }
+
+  factory Horario.infoFromJson(Map<String, dynamic> json) {
+    return Horario (
+      id :json['id'] as String,
+      oficina_id: json['oficina_id'] as String,
+      dia_semana: json['dia_semana'] as String,
+      open_time: json['open_time'] as String,
+      close_time: json['close_time'] as String,
+    );
+  }
+}

fast_med_flutter/lib/widgets/DataTableMySqlDemo/Oficina.dart

@@ -1,13 +1,29 @@
 class Oficina {
   String id;
   String name;
+  String address;
+  String telephone;
+  String email;
 
-  Oficina({this.id, this.name});
+  Oficina({this.id, this.name, this.address, this.telephone, this.email});
 
-  factory Oficina.fromJson(Map<String, dynamic> json) {
+  factory Oficina.allFromJson(Map<String, dynamic> json) {
     return Oficina (
       id :json['id'] as String,
       name: json['name'] as String,
+      address: json['address'] as String,
+      telephone: json['telephone'] as String,
+      email: json['email'] as String,
+    );
+  }
+
+  factory Oficina.infoFromJson(Map<String, dynamic> json) {
+    return Oficina (
+      id :json['id'] as String,
+      name: json['name'] as String,
+      address: json['address'] as String,
+      telephone: json['telephone'] as String,
+      email: json['email'] as String,
     );
   }
 }

fast_med_flutter/lib/widgets/DataTableMySqlDemo/Services.dart

@@ -1,46 +1,104 @@
 import 'dart:convert';
+import 'package:fast_med_flutter/widgets/DataTableMySqlDemo/Horario.dart';
+import 'package:fast_med_flutter/widgets/DataTableMySqlDemo/Especialista.dart';
 import 'package:http/http.dart'
   as http;
 import 'Oficina.dart';
 
 class Services {
-  static const URL = 'https://ada.uprrp.edu/~oniel.mendez2/json/oficinas.php';
-  static const URL_GET_ALL = 'ada.uprrp.edu/~oniel.mendez2/json/getOficinas.php';
-  static const URL_LOCAL = 'http://localhost/test/getOficinas.json';
-  static const _GET_ALL = "GET_ALL";
+  static const URL_GET_ALL = 'http://ada.uprrp.edu/~oniel.mendez2/json/getOficinas.php';
+  static const URL_OFICINA_GET_BY_ID = 'https://ada.uprrp.edu/~oniel.mendez2/json/getOficinaByID.php';
+  static const URL_HORARIO = 'https://ada.uprrp.edu/~oniel.mendez2/json/getHorario.php';
+  static const URL_ESPECIALISTA = 'https://ada.uprrp.edu/~oniel.mendez2/json/getEspecialista.php';
+  //static const _GET_ALL = "GET_ALL";
 
   //get all oficinas
   static Future<List<Oficina>> getOficinas() async {
     try {
-      var map = Map<String, dynamic>();
-      map['action'] = _GET_ALL;
-      //print('antes');
       final response = await http.get(URL_GET_ALL);
-      // print('despues');
-      // print('getOficinas Response: ${response.body}');
       if (200 == response.statusCode) {
-        List<Oficina> list = parseResponse(response.body);
+        final parsed = json.decode(response.body).cast<Map<String, dynamic>>();
+        List<Oficina> list = parsed.map<Oficina>((json) => Oficina.allFromJson(json)).toList();
+        return list;
+      } else {
+        final response = '[{"id":"1","name":"error."},{"id":"2","name":"el codigo"},{"id":"3","name":"!=200"}]';
+        final parsed = json.decode(response).cast<Map<String, dynamic>>();
+        List<Oficina> list = parsed.map<Oficina>((json) => Oficina.allFromJson(json)).toList();
+        return list; // return an empty list on exception/error
+      }
+    } catch (e) {
+      final response = '[{"id":"1","name":"oficina 1,"telephone":"787","address":"Carretera ##","email":"email@domain.com""},'
+                        '{"id":"2","name":"oficina 2","telephone":"787","address":"Carretera ##","email":"email@domain.com"},'
+                        '{"id":"3","name":"oficina 3","telephone":"787","address":"Carretera ##","email":"email@domain.com"}]';
+      final parsed = json.decode(response).cast<Map<String, dynamic>>();
+      List<Oficina> list = parsed.map<Oficina>((json) => Oficina.allFromJson(json)).toList();
+      return list; // return an empty list on exception/error
+    }
+  }
 
+  static Future<List<Oficina>> getOficina(id) async {
+    try {
+      final response = await http.post(URL_OFICINA_GET_BY_ID, body: {'id': id});
+      if (200 == response.statusCode) {
+        final parsed = json.decode(response.body).cast<Map<String, dynamic>>();
+        List<Oficina> list = parsed.map<Oficina>((json) => Oficina.allFromJson(json)).toList();
         return list;
       } else {
-        final response = '[{"id":"1","name":"no"},{"id":"2","name":"respondio"},{"id":"3","name":"code: 200"}]';
-        List<Oficina> list = parseResponse(response);
+        final response = '[{"id":"1","name":"error.","telephone":"787","address":"Carretera ##","email":"email@domain.com"}]';
+        final parsed = json.decode(response).cast<Map<String, dynamic>>();
+        List<Oficina> list = parsed.map<Oficina>((json) => Oficina.allFromJson(json)).toList();
         return list; // return an empty list on exception/error
       }
     } catch (e) {
-      final response = '[{"id":"1","name":"este"},{"id":"2","name":"es el"},{"id":"3","name":"catch(e)"}]';
-      List<Oficina> list = parseResponse(response);
+      final response = '[{"id":"1","name":"oficina 1","telephone":"787","address":"Carretera ##","email":"email@domain.com"}]';
+      final parsed = json.decode(response).cast<Map<String, dynamic>>();
+      List<Oficina> list = parsed.map<Oficina>((json) => Oficina.allFromJson(json)).toList();
       return list; // return an empty list on exception/error
     }
   }
 
-  static List<Oficina> parseResponse(String responseBody) {
-    final parsed = json.decode(responseBody).cast<Map<String, dynamic>>();
-    return parsed.map<Oficina>((json) => Oficina.fromJson(json)).toList();
+  //para conseguir el horario de una oficina
+  static Future<List<Horario>> getHorario(id) async {
+    try {
+      final response = await http.post(URL_HORARIO, body: {'id': id});
+      if (200 == response.statusCode && response != null) {
+        final parsed = json.decode(response.body).cast<Map<String, dynamic>>();
+        List<Horario> list = parsed.map<Horario>((json) => Horario.allFromJson(json)).toList();
+        return list;
+      } else {
+        final response = '[{"id":"1","name":"error.","telephone":"787","address":"Carretera ##","email":"email@domain.com"}]';
+        final parsed = json.decode(response).cast<Map<String, dynamic>>();
+        List<Horario> list = parsed.map<Horario>((json) => Horario.allFromJson(json)).toList();
+        return list; // return an empty list on exception/error
+      }
+    } catch (e) {
+      final response = '[{"id":"1","name":"oficina 1","telephone":"787","address":"Carretera ##","email":"email@domain.com"}]';
+      final parsed = json.decode(response).cast<Map<String, dynamic>>();
+      List<Horario> list = parsed.map<Horario>((json) => Horario.allFromJson(json)).toList();
+      return list; // return an empty list on exception/error
+    }
   }
 
-  Future<http.Response> fetchAlbum() {
-    return http.get('https://jsonplaceholder.typicode.com/albums/1');
+  //para conseguir especialistas que trabajen en una oficina
+  static Future<List<Especialista>> getEspecialista(id) async {
+    try {
+      final response = await http.post(URL_ESPECIALISTA, body: {'id': id});
+      if (200 == response.statusCode && response != null) {
+        final parsed = json.decode(response.body).cast<Map<String, dynamic>>();
+        List<Especialista> list = parsed.map<Especialista>((json) => Especialista.allFromJson(json)).toList();
+        return list;
+      } else {
+        final response = '[{"id":"1","name":"error.","telephone":"787","address":"Carretera ##","email":"email@domain.com"}]';
+        final parsed = json.decode(response).cast<Map<String, dynamic>>();
+        List<Especialista> list = parsed.map<Especialista>((json) => Especialista.allFromJson(json)).toList();
+        return list; // return an empty list on exception/error
+      }
+    } catch (e) {
+      final response = '[{"id":"1","name":"oficina 1","telephone":"787","address":"Carretera ##","email":"email@domain.com"}]';
+      final parsed = json.decode(response).cast<Map<String, dynamic>>();
+      List<Especialista> list = parsed.map<Especialista>((json) => Especialista.allFromJson(json)).toList();
+      return list; // return an empty list on exception/error
+    }
   }
 
 }

fast_med_flutter/lib/widgets/functions.dart

@@ -0,0 +1,54 @@
+import 'package:flutter/material.dart';
+
+FlatButton newButton(context,route,text){
+  return new FlatButton(
+    //minWidth: 300.0,
+    //height: 100.0,
+    onPressed: (){
+      Navigator.pushNamed(context, route);
+    },
+    child: Text(text,
+      style: TextStyle(fontSize: 36),
+    ),
+    color: Colors.purple,
+    //shape: new RoundedRectangleBorder(borderRadius: new BorderRadius.circular(50)),
+    padding: EdgeInsets.all(25),
+  );
+}
+FlatButton verOficinaButton(context,name){
+  return new FlatButton(
+        minWidth: 300.0,
+        height: 100.0,
+        child: Text(name,
+        style: TextStyle(fontSize: 36),
+        ),
+        onPressed: () {
+          print(name);
+        },
+        padding: new EdgeInsets.all(0.0),
+        color: Colors.purple,
+
+      );
+}
+
+SizedBox spaceBetween(){
+  return new SizedBox(height: 16);
+}
+List newButton2(context,route,text){
+  return [new FlatButton(
+          //minWidth: 300.0,
+          //height: 100.0,
+          onPressed: (){
+            Navigator.pushNamed(context, route);
+          },
+          child: Text(text,
+            style: TextStyle(fontSize: 36),
+          ),
+          color: Colors.purple,
+          //shape: new RoundedRectangleBorder(borderRadius: new BorderRadius.circular(50)),
+          padding: EdgeInsets.all(25),
+        )
+    ,
+    new SizedBox(height: 16)
+  ];
+}

fast_med_flutter/pubspec.lock

@@ -36,6 +36,27 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.1.0-nullsafety.1"
+  cloud_firestore:
+    dependency: "direct main"
+    description:
+      name: cloud_firestore
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.13.7"
+  cloud_firestore_platform_interface:
+    dependency: transitive
+    description:
+      name: cloud_firestore_platform_interface
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.1.2"
+  cloud_firestore_web:
+    dependency: transitive
+    description:
+      name: cloud_firestore_web
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.1.1+2"
   collection:
     dependency: transitive
     description:
@@ -85,6 +106,48 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "5.2.1"
+  firebase:
+    dependency: transitive
+    description:
+      name: firebase
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "7.3.3"
+  firebase_core:
+    dependency: transitive
+    description:
+      name: firebase_core
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.4.5"
+  firebase_core_platform_interface:
+    dependency: transitive
+    description:
+      name: firebase_core_platform_interface
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.0.4"
+  firebase_core_web:
+    dependency: transitive
+    description:
+      name: firebase_core_web
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.1.1+2"
+  firebase_helpers:
+    dependency: "direct main"
+    description:
+      name: firebase_helpers
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.1.11"
+  firebase_storage:
+    dependency: transitive
+    description:
+      name: firebase_storage
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "3.1.6"
   flushbar:
     dependency: transitive
     description:
@@ -97,6 +160,11 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
+  flutter_localizations:
+    dependency: "direct main"
+    description: flutter
+    source: sdk
+    version: "0.0.0"
   flutter_login:
     dependency: "direct main"
     description:
@@ -109,13 +177,18 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
+  flutter_web_plugins:
+    dependency: transitive
+    description: flutter
+    source: sdk
+    version: "0.0.0"
   font_awesome_flutter:
     dependency: transitive
     description:
       name: font_awesome_flutter
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "8.10.0"
+    version: "8.11.0"
   google_fonts:
     dependency: "direct main"
     description:
@@ -144,6 +217,27 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "0.16.1"
+  js:
+    dependency: transitive
+    description:
+      name: js
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.6.2"
+  json_table:
+    dependency: "direct dev"
+    description:
+      name: json_table
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.4.0"
+  json_utilities:
+    dependency: transitive
+    description:
+      name: json_utilities
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.1.3"
   matcher:
     dependency: transitive
     description:
@@ -241,7 +335,7 @@ packages:
       name: provider
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "4.3.2+2"
+    version: "4.3.2+3"
   quiver:
     dependency: transitive
     description:
@@ -249,13 +343,55 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "2.1.5"
+  shared_preferences:
+    dependency: "direct main"
+    description:
+      name: shared_preferences
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.5.12+4"
+  shared_preferences_linux:
+    dependency: transitive
+    description:
+      name: shared_preferences_linux
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.0.2+4"
+  shared_preferences_macos:
+    dependency: transitive
+    description:
+      name: shared_preferences_macos
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.0.1+11"
+  shared_preferences_platform_interface:
+    dependency: transitive
+    description:
+      name: shared_preferences_platform_interface
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.0.4"
+  shared_preferences_web:
+    dependency: transitive
+    description:
+      name: shared_preferences_web
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.1.2+7"
+  shared_preferences_windows:
+    dependency: transitive
+    description:
+      name: shared_preferences_windows
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.0.1+3"
   simple_gesture_detector:
     dependency: transitive
     description:
       name: simple_gesture_detector
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.1.4"
+    version: "0.1.6"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -295,7 +431,7 @@ packages:
       name: table_calendar
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.3.0"
+    version: "2.3.3"
   term_glyph:
     dependency: transitive
     description:
@@ -324,6 +460,48 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.3.0-nullsafety.3"
+  url_launcher:
+    dependency: "direct main"
+    description:
+      name: url_launcher
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "5.7.10"
+  url_launcher_linux:
+    dependency: transitive
+    description:
+      name: url_launcher_linux
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.0.1+4"
+  url_launcher_macos:
+    dependency: transitive
+    description:
+      name: url_launcher_macos
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.0.1+9"
+  url_launcher_platform_interface:
+    dependency: transitive
+    description:
+      name: url_launcher_platform_interface
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.0.9"
+  url_launcher_web:
+    dependency: transitive
+    description:
+      name: url_launcher_web
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.1.5+1"
+  url_launcher_windows:
+    dependency: transitive
+    description:
+      name: url_launcher_windows
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.0.1+3"
   vector_math:
     dependency: transitive
     description:
@@ -337,7 +515,7 @@ packages:
       name: win32
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.7.3"
+    version: "1.7.4"
   xdg_directories:
     dependency: transitive
     description:
@@ -347,4 +525,4 @@ packages:
     version: "0.1.2"
 sdks:
   dart: ">=2.10.0-110 <2.11.0"
-  flutter: ">=1.17.0 <2.0.0"
+  flutter: ">=1.22.0 <2.0.0"

fast_med_flutter/pubspec.yaml

@@ -23,7 +23,13 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
+  url_launcher: ^5.4.0
+  shared_preferences: ^0.5.4+5
 
+  firebase_helpers: ^0.1.8
+  cloud_firestore: ^0.13.5
+  flutter_localizations:
+    sdk: flutter
 
   # The following adds the Cupertino Icons font to your application.
   # Use with the CupertinoIcons class for iOS style icons.
@@ -34,10 +40,12 @@ dependencies:
 
   #
   http: ^0.12.2
-
+assets:
+  - assets/raw/certificate.pem
 dev_dependencies:
   flutter_test:
     sdk: flutter
+  json_table: 1.4.0
 
 # For information on the generic Dart part of this file, see the
 # following page: https://dart.dev/tools/pub/pubspec
@@ -51,9 +59,9 @@ flutter:
   uses-material-design: true
 
   # To add assets to your application, add an assets section, like this:
-  # assets:
-  #   - images/a_dot_burr.jpeg
-  #   - images/a_dot_ham.jpeg
+  assets:
+    - lib/languages/en.json
+    - lib/languages/es.json
 
   # An image asset can refer to one or more resolution-specific "variants", see
   # https://flutter.dev/assets-and-images/#resolution-aware.