Merge branch 'master' of https://git.ccom.uprrp.edu/CCOM4030/Mobile_Health

Carlos/gps_fastmed.dart

@@ -1,131 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:url_launcher/url_launcher.dart';
-
-
-void main() {
-  runApp(MyApp());
-}
-
-class MyApp extends StatelessWidget {
-  // This widget is the root of your application.
-  @override
-  Widget build(BuildContext context) {
-    return MaterialApp(
-      title: 'Flutter Demo',
-      theme: ThemeData(
-        // This is the theme of your application.
-        //
-        // Try running your application with "flutter run". You'll see the
-        // application has a blue toolbar. Then, without quitting the app, try
-        // changing the primarySwatch below to Colors.green and then invoke
-        // "hot reload" (press "r" in the console where you ran "flutter run",
-        // or simply save your changes to "hot reload" in a Flutter IDE).
-        // Notice that the counter didn't reset back to zero; the application
-        // is not restarted.
-        primarySwatch: Colors.blue,
-      ),
-      home: MyHomePage(title: 'Flutter Demo Home Page'),
-    );
-  }
-}
-
-class MyHomePage extends StatefulWidget {
-  MyHomePage({Key key, this.title}) : super(key: key);
-
-  // This widget is the home page of your application. It is stateful, meaning
-  // that it has a State object (defined below) that contains fields that affect
-  // how it looks.
-
-  // This class is the configuration for the state. It holds the values (in this
-  // case the title) provided by the parent (in this case the App widget) and
-  // used by the build method of the State. Fields in a Widget subclass are
-  // always marked "final".
-
-  final String title;
-
-  @override
-  _MyHomePageState createState() => _MyHomePageState();
-}
-
-class _MyHomePageState extends State<MyHomePage> {
-  int _counter = 0;
-
-  void _incrementCounter() async {
-    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")!);
-      _counter++;
-    });
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    // This method is rerun every time setState is called, for instance as done
-    // by the _incrementCounter method above.
-    //
-    // The Flutter framework has been optimized to make rerunning build methods
-    // fast, so that you can just rebuild anything that needs updating rather
-    // than having to individually change instances of widgets.
-    return Scaffold(
-      appBar: AppBar(
-        // Here we take the value from the MyHomePage object that was created by
-        // the App.build method, and use it to set our appbar title.
-        title: Text(widget.title),
-      ),
-      body: Center(
-        // Center is a layout widget. It takes a single child and positions it
-        // in the middle of the parent.
-        child: Column(
-          // Column is also a layout widget. It takes a list of children and
-          // arranges them vertically. By default, it sizes itself to fit its
-          // children horizontally, and tries to be as tall as its parent.
-          //
-          // Invoke "debug painting" (press "p" in the console, choose the
-          // "Toggle Debug Paint" action from the Flutter Inspector in Android
-          // Studio, or the "Toggle Debug Paint" command in Visual Studio Code)
-          // to see the wireframe for each widget.
-          //
-          // Column has various properties to control how it sizes itself and
-          // how it positions its children. Here we use mainAxisAlignment to
-          // center the children vertically; the main axis here is the vertical
-          // axis because Columns are vertical (the cross axis would be
-          // horizontal).
-          mainAxisAlignment: MainAxisAlignment.center,
-          children: <Widget>[
-            Text(
-              'You have pushed the button this many times:',
-            ),
-            Text(
-              '$_counter',
-              style: Theme.of(context).textTheme.headline4,
-            ),
-          ],
-        ),
-      ),
-      floatingActionButton: FloatingActionButton(
-        onPressed: _incrementCounter,
-        tooltip: 'Increment',
-        child: Icon(Icons.add),
-      ), // This trailing comma makes auto-formatting nicer for build methods.
-    );
-  }
-}
-

Carlos/main.dart.rtf

@@ -1,109 +0,0 @@
-{\rtf1\ansi\ansicpg1252\cocoartf2577
-\cocoatextscaling0\cocoaplatform0{\fonttbl\f0\fnil\fcharset0 Menlo-Regular;\f1\fnil\fcharset0 Menlo-Italic;}
-{\colortbl;\red255\green255\blue255;\red191\green100\blue38;\red32\green32\blue32;\red88\green118\blue71;
-\red254\green187\blue91;\red153\green168\blue186;\red173\green169\blue32;\red133\green96\blue154;\red86\green132\blue173;
-}
-{\*\expandedcolortbl;;\csgenericrgb\c74902\c39216\c14902;\csgenericrgb\c12549\c12549\c12549;\csgenericrgb\c34510\c46275\c27843;
-\csgenericrgb\c99608\c73333\c35686;\csgenericrgb\c60000\c65882\c72941;\csgenericrgb\c67843\c66275\c12549;\csgenericrgb\c52157\c37647\c60392;\csgenericrgb\c33725\c51765\c67843;
-}
-\margl1440\margr1440\vieww11520\viewh8400\viewkind0
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
-
-\f0\fs24 \cf2 \cb3 import \cf4 'package:flutter/material.dart'\cf2 ;\
-import \cf4 'package:userstory2translate/localization/localization.dart'\cf2 ;\
-import \cf4 'package:userstory2translate/router/custom_router.dart'\cf2 ;\
-import \cf4 'package:userstory2translate/router/route_constants.dart'\cf2 ;\
-import \cf4 'package:flutter_localizations/flutter_localizations.dart'\cf2 ;\
-\
-import \cf4 'localization/language_constants.dart'\cf2 ;\
-\
-void \cf5 main\cf6 () => runApp(\cf5 MyApp\cf6 ())\cf2 ;\
-\
-class \cf6 MyApp \cf2 extends \cf6 StatefulWidget \{\
-  \cf2 const \cf6 MyApp(\{Key key\}) : \cf2 super\cf6 (key: key)\cf2 ;\
-  static void 
-\f1\i \cf5 setLocale
-\f0\i0 \cf6 (BuildContext context\cf2 , \cf6 Locale newLocale) \{\
-    _MyAppState state = context.findAncestorStateOfType<_MyAppState>()\cf2 ;\
-    \cf6 state.setLocale(newLocale)\cf2 ;\
-  \cf6 \}\
-\
-  \cf7 @override\
-  \cf6 _MyAppState \cf5 createState\cf6 () => \cf5 _MyAppState\cf6 ()\cf2 ;\
-\cf6 \}\
-\
-\cf2 class \cf6 _MyAppState \cf2 extends \cf6 State<MyApp> \{\
-  Locale \cf8 _locale\cf2 ;\
-  \cf5 setLocale\cf6 (Locale locale) \{\
-    setState(() \{\
-      \cf8 _locale \cf6 = locale\cf2 ;\
-    \cf6 \})\cf2 ;\
-  \cf6 \}\
-\
-  \cf7 @override\
-  \cf2 void \cf5 didChangeDependencies\cf6 () \{\
-    getLocale().then((locale) \{\
-      setState(() \{\
-        \cf2 this\cf6 .\cf8 _locale \cf6 = locale\cf2 ;\
-      \cf6 \})\cf2 ;\
-    \cf6 \})\cf2 ;\
-    super\cf6 .didChangeDependencies()\cf2 ;\
-  \cf6 \}\
-\
-  \cf7 @override\
-  \cf6 Widget \cf5 build\cf6 (BuildContext context) \{\
-    \cf2 if \cf6 (\cf2 this\cf6 .\cf8 _locale \cf6 == \cf2 null\cf6 ) \{\
-      \cf2 return \cf5 Container\cf6 (\
-        child: \cf5 Center\cf6 (\
-          child: \cf5 CircularProgressIndicator\cf6 (\
-              valueColor: \cf5 AlwaysStoppedAnimation\cf6 <Color>(Colors.
-\f1\i \cf8 blue
-\f0\i0 \cf6 [\cf9 800\cf6 ]))\cf2 ,\
-        \cf6 )\cf2 ,\
-      \cf6 )\cf2 ;\
-    \cf6 \} \cf2 else \cf6 \{\
-      \cf2 return \cf5 MaterialApp\cf6 (\
-        debugShowCheckedModeBanner: \cf2 false,\
-        \cf6 title: \cf4 "Flutter Localization Demo"\cf2 ,\
-        \cf6 theme: \cf5 ThemeData\cf6 (primarySwatch: Colors.
-\f1\i \cf8 blue
-\f0\i0 \cf6 )\cf2 ,\
-        \cf6 locale: \cf8 _locale\cf2 ,\
-        \cf6 supportedLocales: [\
-          \cf5 Locale\cf6 (\cf4 "en"\cf2 , \cf4 "US"\cf6 )\cf2 ,\
-          \cf5 Locale\cf6 (\cf4 "fa"\cf2 , \cf4 "IR"\cf6 )\cf2 ,\
-          \cf5 Locale\cf6 (\cf4 "es"\cf2 , \cf4 "SP"\cf6 )\cf2 ,\
-          \cf5 Locale\cf6 (\cf4 "hi"\cf2 , \cf4 "IN"\cf6 )\
-        ]\cf2 ,\
-        \cf6 localizationsDelegates: [\
-          DemoLocalization.
-\f1\i \cf8 delegate
-\f0\i0 \cf2 ,\
-          \cf6 GlobalMaterialLocalizations.
-\f1\i \cf8 delegate
-\f0\i0 \cf2 ,\
-          \cf6 GlobalWidgetsLocalizations.
-\f1\i \cf8 delegate
-\f0\i0 \cf2 ,\
-          \cf6 GlobalCupertinoLocalizations.
-\f1\i \cf8 delegate
-\f0\i0 \cf2 ,\
-        \cf6 ]\cf2 ,\
-        \cf6 localeResolutionCallback: (locale\cf2 , \cf6 supportedLocales) \{\
-          \cf2 for \cf6 (\cf2 var \cf6 supportedLocale \cf2 in \cf6 supportedLocales) \{\
-            \cf2 if \cf6 (supportedLocale.\cf8 languageCode \cf6 == locale.\cf8 languageCode \cf6 &&\
-                supportedLocale.\cf8 countryCode \cf6 == locale.\cf8 countryCode\cf6 ) \{\
-              \cf2 return \cf6 supportedLocale\cf2 ;\
-            \cf6 \}\
-          \}\
-          \cf2 return \cf6 supportedLocales.\cf8 first\cf2 ;\
-        \cf6 \}\cf2 ,\
-        \cf6 onGenerateRoute: CustomRouter.
-\f1\i \cf5 generatedRoute
-\f0\i0 \cf2 ,\
-        \cf6 initialRoute: homeRoute\cf2 ,\
-      \cf6 )\cf2 ;\
-    \cf6 \}\
-  \}\
-\}\
-}

Jorge/pubspec.yaml

@@ -1,77 +0,0 @@
-name: flutter_app7
-description: A new Flutter application.
-
-# The following line prevents the package from being accidentally published to
-# pub.dev using `pub publish`. This is preferred for private packages.
-publish_to: 'none' # Remove this line if you wish to publish to pub.dev
-
-# The following defines the version and build number for your application.
-# A version number is three numbers separated by dots, like 1.2.43
-# followed by an optional build number separated by a +.
-# Both the version and the builder number may be overridden in flutter
-# build by specifying --build-name and --build-number, respectively.
-# In Android, build-name is used as versionName while build-number used as versionCode.
-# Read more about Android versioning at https://developer.android.com/studio/publish/versioning
-# In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
-# Read more about iOS versioning at
-# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
-version: 1.0.0+1
-
-environment:
-  sdk: ">=2.7.0 <3.0.0"
-
-dependencies:
-  flutter:
-    sdk: flutter
-
-
-  # The following adds the Cupertino Icons font to your application.
-  # Use with the CupertinoIcons class for iOS style icons.
-  cupertino_icons: ^1.0.0
-  table_calendar: ^2,0,1
-
-dev_dependencies:
-  flutter_test:
-    sdk: flutter
-
-# For information on the generic Dart part of this file, see the
-# following page: https://dart.dev/tools/pub/pubspec
-
-# The following section is specific to Flutter.
-flutter:
-
-  # The following line ensures that the Material Icons font is
-  # included with your application, so that you can use the icons in
-  # the material Icons class.
-  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
-
-  # An image asset can refer to one or more resolution-specific "variants", see
-  # https://flutter.dev/assets-and-images/#resolution-aware.
-
-  # For details regarding adding assets from package dependencies, see
-  # https://flutter.dev/assets-and-images/#from-packages
-
-  # To add custom fonts to your application, add a fonts section here,
-  # in this "flutter" section. Each entry in this list should have a
-  # "family" key with the font family name, and a "fonts" key with a
-  # list giving the asset and other descriptors for the font. For
-  # example:
-  # fonts:
-  #   - family: Schyler
-  #     fonts:
-  #       - asset: fonts/Schyler-Regular.ttf
-  #       - asset: fonts/Schyler-Italic.ttf
-  #         style: italic
-  #   - family: Trajan Pro
-  #     fonts:
-  #       - asset: fonts/TrajanPro.ttf
-  #       - asset: fonts/TrajanPro_Bold.ttf
-  #         weight: 700
-  #
-  # For details regarding fonts from package dependencies,
-  # see https://flutter.dev/custom-fonts/#from-packages

README.md

@@ -1,16 +0,0 @@
-# flutter_app7
-
-A new Flutter application.
-
-## Getting Started
-
-This project is a starting point for a Flutter application.
-
-A few resources to get you started if this is your first Flutter project:
-
-- [Lab: Write your first Flutter app](https://flutter.dev/docs/get-started/codelab)
-- [Cookbook: Useful Flutter samples](https://flutter.dev/docs/cookbook)
-
-For help getting started with Flutter, view our
-[online documentation](https://flutter.dev/docs), which offers tutorials,
-samples, guidance on mobile development, and a full API reference.

Carlos/language_constants.dart → fast_med_app/lib/localization/language_constants.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:userstory2translate/localization/localization.dart';
+import '../localization/localization.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
 const String LAGUAGE_CODE = 'languageCode';

fast_med_flutter/lib/main.dart → fast_med_app/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(),
+
     }
 ));

Carlos/about_page.dart → fast_med_app/lib/pages/about_page.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:userstory2translate/localization/language_constants.dart';
+import '../localization/language_constants.dart';
 
 class AboutPage extends StatefulWidget {
   AboutPage({Key key}) : super(key: key);

Carlos/home_page.dart → fast_med_app/lib/pages/home_page.dart

@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
-import 'package:userstory2translate/classes/language.dart';
-import 'package:userstory2translate/localization/language_constants.dart';
-import 'package:userstory2translate/main.dart';
-import 'package:userstory2translate/router/route_constants.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);
@@ -15,7 +15,7 @@ class _HomePageState extends State<HomePage> {
   final GlobalKey<FormState> _key = GlobalKey<FormState>();
   void _changeLanguage(Language language) async {
     Locale _locale = await setLocale(language.languageCode);
-    MyApp.setLocale(context, _locale);
+    translation.setLocale(context, _locale);
   }
 
   void _showSuccessDialog() {

Carlos/settings_page.dart → fast_med_app/lib/pages/settings_page.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
-import 'package:userstory2translate/classes/language.dart';
-import 'package:userstory2translate/localization/language_constants.dart';
-import 'package:userstory2translate/main.dart';
+import '../classes/language.dart';
+import '../localization/language_constants.dart';
+import '../routes/translation.dart';
 
 class SettingsPage extends StatefulWidget {
   SettingsPage({Key key}) : super(key: key);
@@ -13,7 +13,7 @@ class SettingsPage extends StatefulWidget {
 class _SettingsPageState extends State<SettingsPage> {
   void _changeLanguage(Language language) async {
     Locale _locale = await setLocale(language.languageCode);
-    MyApp.setLocale(context, _locale);
+    translation.setLocale(context, _locale);
   }
 
   @override

Carlos/custom_router.dart → fast_med_app/lib/router/custom_router.dart

@@ -1,9 +1,9 @@
 import 'package:flutter/material.dart';
-import 'package:userstory2translate/pages/about_page.dart';
-import 'package:userstory2translate/pages/home_page.dart';
-import 'package:userstory2translate/pages/not_found_page.dart';
-import 'package:userstory2translate/pages/settings_page.dart';
-import 'package:userstory2translate/router/route_constants.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) {

fast_med_app/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_app/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_app/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_app/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_app/lib/routes/calendario.dart

@@ -0,0 +1,229 @@
+import 'package:flutter/material.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
+
+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'],
+};
+
+//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
+  Widget build(BuildContext context) {
+    return MaterialApp(
+      title: 'Citas Disponibles',
+      theme: ThemeData(
+        primarySwatch: Colors.blue,
+      ),
+      home: MyHomePage(),
+      routes: {
+        "add_event": (_) => AddEventPage(),
+      },
+    );
+  }
+}
+
+
+// Define el homepage para el area de citas
+
+class MyHomePage extends StatefulWidget {
+  @override
+  _MyHomePageState createState() => _MyHomePageState();
+}
+
+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 = {
+      //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] ?? [];
+    void _onDaySelected(DateTime day, List events, List holidays) {
+      print('CALLBACK: _onDaySelected');
+      setState(() {
+        _selectedEvents = _events[_selectedDay] ?? [];
+      });
+    }
+  }
+
+  Map<String, dynamic> encodeMap(Map<DateTime, dynamic> map) {
+    Map<String, dynamic> newMap = {};
+    map.forEach((key, value) {
+      newMap[key.toString()] = map[key];
+    });
+    return newMap;
+  }
+
+  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(() {
+      _selectedEvents = events;
+    });
+  }
+
+  void _onVisibleDaysChanged(DateTime first, DateTime last,
+      CalendarFormat format) {
+    print('CALLBACK: _onVisibleDaysChanged');
+  }
+
+  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('Citas Disponibles'),
+      ),
+      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,
+                                      )));
+                        },
+                      )),
+                ],
+              ),
+            );
+          }
+      ),
+      floatingActionButton: FloatingActionButton(
+        child: Icon(Icons.add),
+        onPressed: () => Navigator.pushNamed(context, 'add_event'),
+      ),
+    );
+  }
+}
+
+
+

fast_med_app/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_app/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_app/lib/routes/home.dart

@@ -0,0 +1,37 @@
+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){
+    return Scaffold(
+      appBar: AppBar(
+        title: Text('Bienvenido'),
+        centerTitle: true,
+      ),
+      body: Center(
+        child: ListView(
+          //mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+          children: [
+            newButton(context,'/verOficinas','Ver Oficinas'),
+            spaceBetween(),
+            newButton(context,'/especialidades','especialidades'),
+            spaceBetween(),
+            newButton(context,'/translation','translation'),
+            spaceBetween(),
+            ],
+        ),
+
+      ),
+
+    );
+  }
+}

fast_med_app/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_app/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_app/lib/routes/register.dart

@@ -0,0 +1,274 @@
+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 "."
+//  Hash the passwords
+//  Allow users to login
+//  Verify password and confirm password match
+//
+
+class RegisterPage extends StatefulWidget{
+  
+  RegisterPage({Key key, this.title}) : super(key: key);
+  final String title;
+
+  @override
+  _RegisterPageState createState() => _RegisterPageState();
+}
+
+class _RegisterPageState extends State<RegisterPage> {
+  // TextEditingController name = new TextEditingController();
+  TextEditingController email = new TextEditingController();
+  TextEditingController password = new TextEditingController() ;
+  TextEditingController confirmpass = new TextEditingController();
+
+
+  Future<List> send_data() async {
+
+
+    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");
+    }
+
+  }
+
+  bool _SamePass() {
+    if (password.text == confirmpass.text) {
+      return true;
+    }
+    else {
+      return false;
+    }
+  }
+
+  _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: () {
+        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();
+        // _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,
+        decoration: BoxDecoration(
+          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: 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(
+
+              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),
+                ),
+              ],
+
+            ),
+          )
+      );
+    }
+  }
+

Carlos/main.dart → fast_med_app/lib/routes/translation.dart

@@ -1,15 +1,15 @@
 import 'package:flutter/material.dart';
-import 'package:userstory2translate/localization/localization.dart';
-import 'package:userstory2translate/router/custom_router.dart';
-import 'package:userstory2translate/router/route_constants.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';
+import '../localization/language_constants.dart';
 
-void main() => runApp(MyApp());
+void main() => runApp(translation());
 
-class MyApp extends StatefulWidget {
-  const MyApp({Key key}) : super(key: key);
+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);
@@ -19,7 +19,7 @@ class MyApp extends StatefulWidget {
   _MyAppState createState() => _MyAppState();
 }
 
-class _MyAppState extends State<MyApp> {
+class _MyAppState extends State<translation> {
   Locale _locale;
   setLocale(Locale locale) {
     setState(() {

fast_med_app/lib/routes/ver_oficina.dart

@@ -0,0 +1,304 @@
+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: () {
+                          Navigator.pushNamed(context, '/calendario');
+                        },
+                      ),
+                      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 → fast_med_app/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),
+          )
+          );
+        }
       ),
-
     );
   }
 }

hector/welcome.dart → fast_med_app/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_app/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_app/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_app/lib/widgets/DataTableMySqlDemo/Oficina.dart

@@ -0,0 +1,29 @@
+class Oficina {
+  String id;
+  String name;
+  String address;
+  String telephone;
+  String email;
+
+  Oficina({this.id, this.name, this.address, this.telephone, this.email});
+
+  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_app/lib/widgets/DataTableMySqlDemo/Services.dart

@@ -0,0 +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_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 {
+      final response = await http.get(URL_GET_ALL);
+      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":"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":"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":"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
+    }
+  }
+
+  //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
+    }
+  }
+
+  //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
+    }
+  }
+
+}