ajustes

backend/src/controller/themes/themes.controller.js

@@ -93,9 +93,24 @@ const eliminar = async function (req, res) {
   }
 };
 
+const actualizarOrden = async function (req, res) {
+  try {
+    await themesService.actualizarOrden(req.body);
+    res.json({
+      success: true,
+    });
+  } catch (error) {
+    res.json({
+      success: false,
+      error: error.message,
+    });
+  }
+};
+
 module.exports = {
   listar,
   busquedaPorCodigo: consultarPorCodigo,
   actualizar,
   eliminar,
+  actualizarOrden,
 };

backend/src/controller/topics/topics.controller.js

@@ -188,11 +188,15 @@ const listarSharedMeController = async function (req, res) {
 
 const actualizarOrden = async function (req, res) {
   try {
-    const topicos = req.body;
-    await topicsService.actualizarOrden(topicos);
-    res.json({ success: true, message: 'Orden actualizado correctamente.' });
+    await topicsService.actualizarOrden(req.body);
+    res.json({
+      success: true,
+    });
   } catch (error) {
-    res.json({ success: false, error: error.message });
+    res.json({
+      success: false,
+      error: error.message,
+    });
   }
 };
 

backend/src/model/themes.model.js

@@ -28,6 +28,11 @@ const ThemesModel = sequelize.define("Themes", {
     type: DataTypes.INTEGER,
     allowNull:true
   },
+  order_index: {
+    type: DataTypes.INTEGER,
+    allowNull: false,
+    defaultValue: 0
+  },
 },{
     tableName: 'themes',
     timestamps: false

backend/src/model/topics.model.js

@@ -8,39 +8,44 @@ const TopicsModel = sequelize.define("Topics", {
     primaryKey: true,
     autoIncrement: true,
   },
-  create_date:{
+  create_date: {
     type: DataTypes.TIME,
-    allowNull:false
+    allowNull: false
   },
-  name:{
+  name: {
     type: DataTypes.STRING,
-    allowNull:true
+    allowNull: true
   },
-  topic_id:{
+  topic_id: {
     type: DataTypes.STRING,
-    allowNull:true
+    allowNull: true
   },
-  order:{
+  order: {
     type: DataTypes.INTEGER,
-    allowNull:true
+    allowNull: true
   },
-  priority:{
+  priority: {
     type: DataTypes.INTEGER,
-    allowNull:true
+    allowNull: true
   },
-  color:{
+  color: {
     type: DataTypes.STRING,
-    allowNull:true
+    allowNull: true
   },
-  owner_user_id:{
+  owner_user_id: {
     type: DataTypes.INTEGER,
-    allowNull:true
+    allowNull: true
   },
-},{
-    tableName: 'topics',
-    timestamps: false
+  order_index: {
+    type: DataTypes.INTEGER,
+    allowNull: false,
+    defaultValue: 0
+  },
+}, {
+  tableName: 'topics',
+  timestamps: false
 });
 
 module.exports = {
-    TopicsModel
+  TopicsModel
 };

backend/src/route/themes/themes.route.js

@@ -15,4 +15,9 @@ module.exports = function (app) {
     authMiddleware.auth,
     themesController.eliminar
   );
+  app.post("/themes/update-order",
+    authMiddleware.auth,
+    themesController.actualizarOrden
+  );
+
 };

backend/src/route/topics/topics.route.js

@@ -47,5 +47,9 @@ module.exports = function (app) {
     authMiddleware.auth,
     topicsController.actualizarOrden
   );
+  app.post("/topics/update-order",
+    authMiddleware.auth,
+    topicsController.actualizarOrden
+  );
 
 };

backend/src/service/themes.service.js

@@ -8,7 +8,7 @@ const listar = async function (textoBuscar) {
       FROM themes
       WHERE 1=1
         AND UPPER(name) LIKE UPPER('%${textoBuscar}%')
-      ORDER BY id`);
+      ORDER BY order_index ASC`);
     if (themes && themes[0]) {
       return themes[0];
     } else {
@@ -77,9 +77,26 @@ const eliminar = async function (codigo) {
   }
 };
 
+const actualizarOrden = async function (orderData) {
+  const transaction = await sequelize.transaction();
+  try {
+    for (const item of orderData) {
+      await ThemesModel.update({ order_index: item.order_index }, {
+        where: { id: item.id },
+        transaction
+      });
+    }
+    await transaction.commit();
+  } catch (error) {
+    await transaction.rollback();
+    throw error;
+  }
+};
+
 module.exports = {
   listar,
   busquedaPorCodigo: consultarPorCodigo,
   actualizar,
   eliminar,
+  actualizarOrden,
 };

backend/src/service/topics.service.js

@@ -9,7 +9,7 @@ const listar = async function (textoBuscar) {
       FROM topics
       WHERE 1=1
         AND UPPER(name) LIKE UPPER('%${textoBuscar}%')
-      ORDER BY "order"`);
+      ORDER BY order_index ASC`);
     if (topics && topics[0]) {
       return topics[0];
     } else {
@@ -171,13 +171,20 @@ const listarSharedMeService = async function (userId) {
   }
 };
 
-const actualizarOrden = async function (topicos) {
+const actualizarOrden = async function (orderData) {
+  const transaction = await sequelize.transaction();
   try {
-    for (const topico of topicos) {
-      await TopicsModel.update({ order: topico.order }, { where: { id: topico.id } });
+    console.log("qweeeqwe", orderData);
+    for (const item of orderData) {
+      await TopicsModel.update({ order_index: item.order_index }, {
+        where: { id: item.id },
+        transaction
+      });
     }
+    await transaction.commit();
   } catch (error) {
-    throw new Error("Error al actualizar el orden en la base de datos");
+    await transaction.rollback();
+    throw error;
   }
 };
 

frontend/src/app/theme-list/theme-list.page.html

@@ -20,7 +20,7 @@
         <ion-button color="dark" fill="outline" (click)="sortIdDesc()">ID Desc</ion-button>
       </div>
     </ion-card-content>
-  
+
     <ion-list>
       <ion-reorder-group [disabled]="false" (ionItemReorder)="reorder($event)">
         <!-- NOMBRE Y DESCRIPCION DEL TEMA-->
@@ -39,7 +39,14 @@
       </ion-reorder-group>
 
     </ion-list>
-  </ion-card> 
+    <div class="ion-text-center" style="padding-bottom: 5%;">
+      <ion-button (click)="saveOrder()" shape="round">
+        Guardar
+        <ion-icon slot="end" name="save-outline"></ion-icon>
+           </ion-button>
+    </div>
+
+  </ion-card>
 
   <!-- AGREGAR TEMA-->
   <ion-fab slot="fixed" vertical="bottom" horizontal="end">

frontend/src/app/theme-list/theme-list.page.ts

@@ -17,7 +17,7 @@ export class ThemeListPage implements OnInit {
     private toastController: ToastController,
     private alertController: AlertController,
     private router: Router
-  ) {}
+  ) { }
 
   ionViewWillEnter(): void {
     //verificar si el usuario no esta logueado
@@ -29,7 +29,7 @@ export class ThemeListPage implements OnInit {
     this.getThemes();
   }
 
-  ngOnInit() {}
+  ngOnInit() { }
 
   async confirmDelete(id: string) {
     const alert = await this.alertController.create({
@@ -109,14 +109,34 @@ export class ThemeListPage implements OnInit {
     await toast.present();
   }
 
-
-  //Ordenar visualmente
+  // Agrega una función para guardar el nuevo orden en el backend
+  saveOrder() {
+    let token = localStorage.getItem('token');
+    let config = {
+      headers: {
+        Authorization: token,
+      },
+    };
+    const orderData = this.temas.map((tema: any, index: any) => ({ id: tema.id, order_index: index }));
+    axios.post('http://localhost:3000/themes/update-order', orderData, config)
+      .then((result) => {
+        if (result.data.success) {
+          this.presentToast('Orden guardado con éxito');
+        }
+      })
+      .catch((error) => {
+        this.presentToast('Error al guardar el orden: ' + error.message);
+      });
+  }
+
+  // Modifica la función de reordenamiento para que llame a saveOrder
   reorder(event: any) {
     const moverItem = this.temas.splice(event.detail.from, 1)[0];
     this.temas.splice(event.detail.to, 0, moverItem);
     event.detail.complete();
   }
 
+
   //ordenamientos
   sortAZ() {
     this.temas.sort((a: any, b: any) => {

frontend/src/app/topic-list/topic-list.page.html

@@ -26,8 +26,10 @@
     <ion-list>
       <ion-reorder-group [disabled]="false" (ionItemReorder)="reorder($event)">
         <ion-item *ngFor="let topico of topicos">
-          <ion-label  [style.color]="topico.color">{{topico.id}} - {{topico.name}}</ion-label>
+          <ion-label [style.color]="topico.color">{{topico.id}} - {{topico.name}}</ion-label>
           <ion-buttons slot="end">
+            <input type="color" [(ngModel)]="topico.color" />
+
             <!-- Visualizar -->
             <ion-button [routerLink]="'/topic-details/' + topico.id">
               <ion-icon slot="icon-only" name="eye-outline" style="font-size: 30px;"></ion-icon>
@@ -43,7 +45,12 @@
       </ion-reorder-group>
     </ion-list>
 
-    <ion-button color="primary" (click)="saveOrder()">Guardar Orden</ion-button>
+    <div class="ion-text-center" style="padding-bottom: 5%;">
+      <ion-button (click)="saveOrder()" shape="round">
+        Guardar
+        <ion-icon slot="end" name="save-outline"></ion-icon>
+           </ion-button>
+    </div>
 
   </ion-card>
 
@@ -54,7 +61,7 @@
     <ion-card-content>
       <ion-list>
         <ion-item *ngFor="let topico of topicosCompartidosConmigo">
-          <ion-label  [style.color]="topico.color">{{topico.id}} - {{topico.name}}</ion-label>
+          <ion-label [style.color]="topico.color">{{topico.id}} - {{topico.name}}</ion-label>
           <ion-buttons slot="end">
             <!-- Visualizar -->
             <ion-button [routerLink]="'/topic-details/' + topico.id">

frontend/src/app/topic-list/topic-list.page.ts

@@ -74,7 +74,7 @@ export class TopicListPage implements OnInit {
         if (result.data.success == true) {
           this.topicos = result.data.topicos;
           console.log(this.topicos);
-          
+
         } else {
           console.log(result.data.error);
         }
@@ -128,21 +128,6 @@ export class TopicListPage implements OnInit {
 
   }
 
-  updateOrderInBackend() {
-    // Aquí, envía los tópicos con el nuevo orden al backend
-    let token = localStorage.getItem('token');
-    let config = {
-      headers: {
-        Authorization: token,
-      },
-    };
-
-    axios.post('http://localhost:3000/topics/updateOrder', this.topicos, config)
-      .then(response => console.log(response))
-      .catch(error => console.error(error));
-  }
-
-
   sortAZ() {
     this.topicos.sort((a: any, b: any) => {
       const nameA = a.name.toUpperCase();
@@ -206,7 +191,22 @@ export class TopicListPage implements OnInit {
   }
 
   saveOrder() {
-    this.updateOrderInBackend();
+    let token = localStorage.getItem('token');
+    let config = {
+      headers: {
+        Authorization: token,
+      },
+    };
+    const orderData = this.topicos.map((tema: any, index: any) => ({ id: tema.id, order_index: index }));
+    axios.post('http://localhost:3000/topics/update-order', orderData, config)
+      .then((result) => {
+        if (result.data.success) {
+          this.presentToast('Orden guardado con éxito');
+        }
+      })
+      .catch((error) => {
+        this.presentToast('Error al guardar el orden: ' + error.message);
+      });
   }
-  
+
 }