Sprint 1

fast_med_flutter/lib/res/event_firestore_service.dart

@@ -1,6 +0,0 @@
-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/routes/calendario.dart

@@ -1,31 +1,23 @@
 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:intl/date_symbol_data_local.dart';
 import 'package:table_calendar/table_calendar.dart';
-import 'dart:convert';
-import 'package:shared_preferences/shared_preferences.dart';
-//import 'package:firebase_core/firebase_core.dart';
-import 'dart:async';
-import 'package:http/http.dart' as http;
-
-import 'model/event.dart';
-
-void main() async{
-
-  var url = 'https://ada.uprrp.edu/~jorge.lopez19/FastMed/API/InsertEvent.php';
-  WidgetsFlutterBinding.ensureInitialized();
-  //==final data = await http.post(url, body: {
-    //"name": name.text,
-    //"reason": reason.text,
-    //"date": date.text,
-    //"time": time.text,
- // }
-  //);
-  runApp(Calendario());
-}
 
+// 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): ['Chrismas'],
+  DateTime(2020,12,31): ['Despedida del anyo nuevo'],
+
+};
+
+//Iniciar la Seccion de las Citas
+void main() {
+  initializeDateFormatting().then((_) => runApp(Calendario()));
+}
 
 
+//Inicio del Area de las Citas Disponibles
 class Calendario extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
@@ -34,142 +26,331 @@ class Calendario extends StatelessWidget {
       theme: ThemeData(
         primarySwatch: Colors.blue,
       ),
-      home: MyHomePage(),
-      routes: {
-        "add_event": (_) => AddEventPage(),
-      },
+      home: MyHomePage(title: 'Citas Disponibles'),
     );
   }
 }
 
+class MyHomePage extends StatefulWidget {
+  MyHomePage({Key key, this.title}) : super(key: key);
 
+  final String title;
 
-class MyHomePage extends StatefulWidget {
   @override
   _MyHomePageState createState() => _MyHomePageState();
 }
 
-class _MyHomePageState extends State<MyHomePage> {
-  CalendarController _controller;
-  Map<DateTime, List<dynamic>> _events;
-  List<dynamic> _selectedEvents;
+//Definimos los controladores del Calendario
+class _MyHomePageState extends State<MyHomePage> with TickerProviderStateMixin {
+  Map<DateTime, List> _events;
+  List _selectedEvents;
+  AnimationController _animationController;
+  CalendarController _calendarController;
+  Map<DateTime,List<dynamic>> _events2;
 
+//Definimos el dia elegido
   @override
   void initState() {
     super.initState();
-    _controller = CalendarController();
-    _events = {};
-    _selectedEvents = [];
+    final _selectedDay = DateTime.now();
+
+    _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'],
+
+    };
+    //Dias de Citas Seleccionados como Recordatorio
+    _selectedEvents = _events[_selectedDay] ?? [];
+    _calendarController = CalendarController();
+    _events2 = {};
+
+    _animationController = AnimationController(
+      vsync: this,
+      duration: const Duration(milliseconds: 400),
+    );
+
+    _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;
   }
 
-  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);
+  Map<DateTime,dynamic> decodeMap(Map<String,dynamic> map) {
+    Map<DateTime,dynamic> newMap = {};
+    map.forEach((key,value) {
+      newMap[DateTime.parse(key)] = map[key];
     });
-    return data;
+    return newMap;
   }
 
 
 
   @override
+  void dispose() {
+    _animationController.dispose();
+    _calendarController.dispose();
+    super.dispose();
+  }
+//Acciones definidas cuando se elige un dia en particular para ver si esta disponible o no
+  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 el "look" del area de las citas
+  @override
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
-        title: Text('Citas Disponibles'),
+        title: Text(widget.title),
+      ),
+      body: Column(
+        mainAxisSize: MainAxisSize.max,
+        children: <Widget>[
+
+          _buildTableCalendar(
+
+          ),
+          // _buildTableCalendarWithBuilders(),
+          const SizedBox(height: 8.0),
+          _buildButtons(),
+          const SizedBox(height: 8.0),
+          Expanded(child: _buildEventList()),
+        ],
+      ),
+    );
+  }
+
+  // Simple configuracion de la Tabla de Calendario usando estilos
+  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,
       ),
-      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,
-                    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,
-
-                    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,
-                                      )));
-                        },
-                      )),
-                ],
+      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,
+    );
+  }
+  // Configuraciones detalladas del area de citas como definir dias, meses, etc.
+  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: '',
+      },
+      //Colores de los dias seleccionados
+      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, _) {
+          //Animacion del Calendario al cambiar el mes
+          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(),
+              ),
+            );
+          }
+
+          return children;
+        },
       ),
-      floatingActionButton: FloatingActionButton(
-        child: Icon(Icons.add),
-        onPressed: () => Navigator.pushNamed(context, 'add_event'),
+      onDaySelected: (date, events, holidays) {
+        _onDaySelected(date, events, holidays);
+        _animationController.forward(from: 0.0);
+      },
+      onVisibleDaysChanged: _onVisibleDaysChanged,
+      onCalendarCreated: _onCalendarCreated,
+    );
+  }
+//Marcador de eventos (aparece debajo de los dias)
+  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,
+          ),
+        ),
       ),
     );
   }
-}
 
+  Widget _buildHolidaysMarker() {
+    return Icon(
+      Icons.add_box,
+      size: 20.0,
+      color: Colors.blueGrey,
+    );
+  }
+
+  Widget _buildButtons() {
+    final dateTime = _events.keys.elementAt(_events.length - 2);
+  //Definimos formato del calendario (mes, 2 semanas, semana)
+    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,
+            );
+          },
+        ),
+      ],
+    );
+  }
+
+  //Muestra las citas ya creadas
+  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/ui/pages/add_event.dart

@@ -1,210 +0,0 @@
-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';
-import 'dart:convert';
-
-class AddEventPage extends StatefulWidget {
-  final EventModel note;
-
-  const AddEventPage({Key key, this.note}) : super(key: key);
-
-  @override
-  _AddEventPageState createState() => _AddEventPageState();
-}
-
-class _AddEventPageState extends State<AddEventPage> {
-  TextStyle style = TextStyle(fontFamily: 'Montserrat', fontSize: 20.0);
-  TextEditingController _title;
-  TextEditingController _description;
-  TextEditingController _number;
-  TextEditingController _name;
-  TextEditingController _reason;
-  TextEditingController _date;
-  TextEditingController _time;
-
-  DateTime _eventDate;
-  DateTime _eventTime;
-  DateTime selectedDate = DateTime.now();
-  List data;
-  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 : "");
-    //_date = TextEditingController(text:  widget.note != null ?  widget.note.eventDate;
-    _eventDate = DateTime.now();
-    //_eventTime = Time.now();
-    processing = false;
-  }
-
-
-  @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>[
-              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))),
-                ),
-              ),
-              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))),
-                ),
-              ),
-              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),
-              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;
-                    });
-                  }
-                },
-              ),
-
-              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),
-              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.DateTime,
-                          });
-                        }else{
-                          await eventDBS.createItem(EventModel(
-                              title: _title.text,
-                              description: _description.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();
-    super.dispose();
-  }
-}
-
-Future<TimeOfDay> _selectTime(BuildContext context) {
-  final now = DateTime.now();
-
-  return showTimePicker(
-    context: context,
-    initialTime: TimeOfDay(hour: now.hour, minute: now.minute),
-  );
-}
-
-Future<DateTime> _selectDateTime(BuildContext context) => showDatePicker(
-  context: context,
-  initialDate: DateTime.now().add(Duration(seconds: 1)),
-  firstDate: DateTime.now(),
-  lastDate: DateTime(2100),
-);

fast_med_flutter/lib/ui/pages/view_event.dart

@@ -1,28 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:fast_med_flutter/model/event.dart';
-
-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)
-          ],
-        ),
-      ),
-    );
-  }
-}