Merge remote-tracking branch 'origin/firebase' into dev

# Conflicts: # lib/model/promemoria.dart
2023-09-29 11:57:24 +02:00
parent 67dd09b2dd 34a73c62f7
commit a4a13cc2ea
10 changed files with 1373 additions and 150 deletions
--- a/lib/database/controller.dart
+++ b/lib/database/controller.dart
@@ -0,0 +1,81 @@
+import '../model/note.dart';
+import '../model/promemoria.dart';
+import 'database.dart';
+
+class Controller {
+  NoteDatabase database = NoteDatabase.instance;
+
+  Future<List<Note>> getAllNote() async {
+    final db = await database.database;
+    var notes = await db.query(noteTable);
+    List<Note> noteList = notes.map((e) => Note.fromJson(e)).toList();
+    return noteList;
+  }
+
+  Future<List<Promemoria>> getAllPromemoria() async {
+    final db = await database.database;
+    var promemorias = await db.query(promemoriaTable);
+    List<Promemoria> promemoriaList =
+        promemorias.map((e) => Promemoria.fromJson(e)).toList();
+    return promemoriaList;
+  }
+
+  Future<Note> getNoteById(int id) async {
+    final db = await database.database;
+    var note = await db.query(noteTable, where: 'id = ?', whereArgs: [id]);
+    return Note.fromJson(note.first);
+  }
+
+  Future<Promemoria> getPromemoriaById(int id) async {
+    final db = await database.database;
+    var promemoria =
+        await db.query(promemoriaTable, where: 'id = ?', whereArgs: [id]);
+    return Promemoria.fromJson(promemoria.first);
+  }
+
+  //add note
+  void addNote(Note note) async {
+    final db = await database.database;
+    await db.execute('''
+  INSERT INTO note (
+    title,
+    creationDate,
+    lastModificationDate,
+    arrayPromemoria,
+    description
+  ) VALUES (
+    '${note.title}',
+    '${note.creationDate}',
+    '${note.lastModificationDate}',
+    '${note.arrayPromemoria}',
+    '${note.description}'
+  )
+''');
+  }
+
+  //add Promemoria
+  void addPromemoria(Promemoria promemoria) async {
+    final db = await database.database;
+    await db.execute('''
+     INSERT INTO promemoria (
+        title,
+        creationDate,
+        lastModificationDate,
+        expirationDate,
+        arrayPromemoria,
+        description,
+        priority,
+        color
+      ) VALUES (
+        '${promemoria.title}',
+        '${promemoria.creationDate}',
+        '${promemoria.lastModificationDate}',
+        '${promemoria.expirationDate}',
+        '${promemoria.arrayPromemoria}',
+        '${promemoria.description}',
+        '${promemoria.priority}',
+        '${promemoria.color}'
+      )
+    ''');
+  }
+}
--- a/lib/database/database.dart
+++ b/lib/database/database.dart
@@ -1,17 +1,12 @@
 import 'package:path/path.dart';
 import 'package:sqflite/sqflite.dart';

-// Models
-import 'package:progetto_m335_flutter/model/note.dart';
 import 'package:progetto_m335_flutter/model/promemoria.dart';

 class NoteDatabase {
  static final NoteDatabase instance = NoteDatabase._init();
  static Database? _database;

-  // Zero args constructor needed to extend this class
-  NoteDatabase();
-
  NoteDatabase._init();

  Future<Database> get database async {
@@ -29,11 +24,6 @@ class NoteDatabase {
  }

  Future _createDB(Database database, int version) async {
-    if (await isDatabaseExists()) {
-      print("Database already created");
-      deleteDatabase();
-      print("Database deleted");
-    }

    await database.execute('''CREATE TABLE promemoria (
  id INTEGER PRIMARY KEY AUTOINCREMENT,
@@ -64,22 +54,6 @@ class NoteDatabase {

  Future fillDemoData(Database database, int version) async {

-    var nota = Note();
-    nota.setTitle("Nota 1");
-    nota.setCreationDate("2023-09-56");
-    nota.setLastModificationDate("2023-09-56");
-    nota.setArrayPromemoria("1,2,3,4,5");
-    nota.setDescription("Questo è un esempio di nota 1.");
-
-    await createNote(database, nota);
-
-    print(await readNote(1));
-
-    nota.setDescription("ciao");
-    await updateNote (nota);
-
-    print(await readNote (1));
-
    // Add fake categories
    await database.execute('''
  INSERT INTO note (
@@ -92,6 +66,7 @@ class NoteDatabase {
    'Nota 2',
    '2023-09-28',
    '2023-09-28',
+    '1,1',
    'Questo è un esempio di nota 2.'
  )
 ''');
@@ -107,11 +82,11 @@ class NoteDatabase {
    'Nota 2',
    '2023-09-28',
    '2023-09-28',
+    '1,1',
    'Questo è un esempio di nota 2.'
  )
 ''');

-    // Add currencies
    await database.execute('''
  INSERT INTO promemoria (
    title,
@@ -127,6 +102,7 @@ class NoteDatabase {
    '2023-09-27',
    '2023-09-27',
    '2023-10-05',
+    '2,1',
    'Questo è un esempio di promemoria 1.',
    'Alta',
    'Rosso'
@@ -149,6 +125,7 @@ class NoteDatabase {
    '2023-09-28',
    '2023-09-28',
    '2023-10-10',
+    '1,1',
    'Questo è un esempio di promemoria 2.',
    'Media',
    'Verde'
@@ -157,40 +134,6 @@ class NoteDatabase {
    print("Demo data inserted");
  }

-  Future clearDatabase() async {
-    try {
-      await _database?.transaction((txn) async {
-        var batch = txn.batch();
-        batch.delete(noteTable);
-        batch.delete(promemoriaTable);
-        await batch.commit();
-      });
-    } catch (error) {
-      throw Exception('DbBase.cleanDatabase: $error');
-    }
-  }
-
-  Future close() async {
-    final database = await instance.database;
-    database.close();
-  }
-
-  Future<void> deleteDatabase() async {
-    final databasePath = await getDatabasesPath();
-    final path = join(databasePath, 'note.db');
-    databaseFactory.deleteDatabase(path);
-  }
-
-  Future<bool> isDatabaseExists() async {
-    final databasePath = await getDatabasesPath();
-    final path = join(databasePath, 'note.db');
-    // Apre il database in modalità sola lettura.
-    Database database = await openDatabase(path, readOnly: true);
-
-    // Restituisce true se il database è stato aperto correttamente, altrimenti false.
-    return database.isOpen;
-  }
-
  Future<List<Map>> selectAllPromemoria() async {
    final db = await database;

@@ -199,61 +142,6 @@ class NoteDatabase {
    return maps;
  }

-  Future<List<Map>> selectAllNotes() async {
-    final db = await database;

-    final List<Map<String, dynamic>> maps = await db.query(noteTable);

-    return maps;
-  }
-
-  Future<void> createNote(Database database, Note note) async {
-    await database.insert(
-      'note',
-      note.toMap(),
-      conflictAlgorithm: ConflictAlgorithm.replace,
-    );
-
-    print('note $note.title inserted');
-  }
-
-  Future<void> createPromemoria(
-      Database database, Promemoria promemoria) async {
-    await database.insert(
-      'promemoria',
-      promemoria.toMap(),
-      conflictAlgorithm: ConflictAlgorithm.replace,
-    );
-
-    print('promemoria $promemoria.title inserted');
-  }
-
-  Future<Map<String, Object?>> readPromemoria(int id) async {
-    final db = await database;
-
-    final results = await db.query('SELECT * FROM note where id=$id');
-    return results.first;
-  }
-
-  Future<Map<String, Object?>> readNote(int id) async {
-    final db = await database;
-
-    final results = await db.query('SELECT * FROM promemoria where id=$id');
-
-    return results.first;
-  }
-
-  Future<void> updatePromemoria(Promemoria promemoria) async {
-    final db = await database;
-
-    await db.update('promemoria', promemoria.toMap(),
-        where: 'id = ?', whereArgs: [promemoria.getId()]);
-  }
-
-  Future<void> updateNote(Note note) async {
-    final db = await database;
-
-    await db.update('note', note.toMap(),
-        where: 'id = ?', whereArgs: [note.getId()]);
-  }
 }
--- a/lib/model/base_entity.dart
+++ b/lib/model/base_entity.dart
@@ -1,19 +0,0 @@
-abstract class BaseEntity{
-  static String id = 'id';
-  static String title = 'Title';
-  static String creationDate = 'CreationDate';
-  static String lastEditDate = 'LastEditDate';
-  
-  static String get getId{
-    return id;
-  }
-  static String get getTitle{
-    return title;
-  }
-  static String get getCreationDate{
-    return creationDate;
-  }
-  static String get getLastEditDate{
-    return lastEditDate;
-  }
-}
--- a/lib/model/note.dart
+++ b/lib/model/note.dart
@@ -1,13 +1,13 @@
-import 'base_entity.dart';
+

 const String noteTable = 'note';

 class Note{
-  String id;
+  String id='';
  String title;
  String creationDate;
  String lastModificationDate;
-  String arrayPromemoria;
+  String? arrayPromemoria;
  String description;

  Map<String, dynamic> toMap() {
@@ -30,6 +30,14 @@ class Note{
    this.description,
  );

+  Note.newConstructor(
+    this.title,
+    this.creationDate,
+    this.lastModificationDate,
+    this.arrayPromemoria,
+    this.description,
+  );
+
  String getId() {
    return id;
  }
@@ -62,7 +70,7 @@ class Note{
    lastModificationDate = lastModificationDate1;
  }

-  String getArrayPromemoria() {
+  String? getArrayPromemoria() {
    return arrayPromemoria;
  }

@@ -79,7 +87,7 @@ class Note{
  }

  static Note fromJson(Map<String, dynamic> data) => Note(
-      data['id'],
+      data['id'].toString(),
      data['title'],
      data['creationDate'],
      data['lastModificationDate'],
--- a/lib/model/promemoria.dart
+++ b/lib/model/promemoria.dart
@@ -6,14 +6,14 @@ const String promemoriaTable = 'promemoria';

 class Promemoria {
  String id = '';
-  String title = '';
-  String creationDate = '';
-  String lastModificationDate = '';
-  String expirationDate = '';
-  String arrayPromemoria = '';
-  String description = '';
-  String priority = '';
-  String color = '';
+  String title;
+  String creationDate;
+  String lastModificationDate;
+  String expirationDate;
+  String? arrayPromemoria;
+  String description;
+  String priority;
+  String color;

  Promemoria(
      this.id,
@@ -106,7 +106,7 @@ class Promemoria {
    expirationDate = expirationDate1;
  }

-  String getArrayPromemoria() {
+  String? getArrayPromemoria() {
    return arrayPromemoria;
  }

@@ -140,7 +140,7 @@ class Promemoria {

  static Promemoria fromJson(Map<String, dynamic> data) {
    Promemoria promemoria = Promemoria(
-        data['id'],
+        data['id'].toString(),
        data['title'],
        data['creationDate'],
        data['lastModificationDate'],
--- a/lib/pages/test.dart
+++ b/lib/pages/test.dart
@@ -1,6 +1,8 @@
 import 'package:flutter/material.dart';
+import 'package:progetto_m335_flutter/database/controller.dart';
 import 'package:progetto_m335_flutter/database/database.dart';
 import 'package:progetto_m335_flutter/model/note.dart';
+import 'package:progetto_m335_flutter/model/promemoria.dart';

 import '../database/database.dart';

@@ -13,6 +15,7 @@ class Test extends StatefulWidget {

 class _TestState extends State<Test> {
  NoteDatabase noteDatabase = NoteDatabase.instance;
+  Controller controller = Controller();

  Future<void> _pressed() async {
    print("Inserting demo data");
@@ -22,11 +25,41 @@ class _TestState extends State<Test> {
  }

  Future<void> _printdata() async {
+
+
+    var nota = Note.newConstructor(
+        "nota 5",
+        "2023-09-56",
+        "2028-03-1",
+        "1,2,3,4,5",
+        "Questo è un esempio di nota gesu benedetto 1.");
+
+    var promemoria = Promemoria.newConstructor(
+        "promemoria 5",
+        "2023-09-56",
+        "2028-03-1",
+        "2028-03-1",
+        "1,2,3,4,5",
+        "Questo è un esempio di promemoria gesu benedetto 1.",
+        "alta",
+        "rosso");
+
+    controller.addNote(nota);
+    controller.addPromemoria(promemoria);
+
    final db = await noteDatabase.database;

    print("Printing data");
+    print((await controller.getAllPromemoria()).first);
+    print((await controller.getAllNote()).first);
+    print("promemoria");
+    print(await db.query(promemoriaTable));
+    print("note");
    print(await db.query(noteTable));
    print("Data printed");
+
+
+
  }

  @override