(Lab 250) Mejoras ABM usuarios

.github/workflows/label02_has_conflicts.yaml

@@ -0,0 +1,84 @@
+name: PR conflict label
+
+on:
+  pull_request:
+    types: [opened, synchronize, reopened]
+  push:
+    branches: [master]
+
+permissions:
+  pull-requests: write
+  issues: write
+  contents: read
+
+jobs:
+  conflicts:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check conflicts
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const { owner, repo } = context.repo;
+
+            async function checkPR(pr) {
+              let data;
+              let retries = 5;
+              const issue_number = pr.number;
+
+              while (retries > 0) {
+                const response = await github.rest.pulls.get({
+                  owner,
+                  repo,
+                  pull_number: issue_number
+                });
+                data = response.data;
+                console.log(`PR #${issue_number} - mergeable: ${data.mergeable}, state: ${data.mergeable_state}`);
+
+                // Si mergeable es null, GitHub aún está calculando
+                if (data.mergeable !== null) break;
+
+                await new Promise(r => setTimeout(r, 5000));
+                retries--;
+              }
+
+              // Usamos mergeable === false para detectar conflictos reales
+              if (data.mergeable === false) {
+                console.log(`Adding "Conflictos" label to PR #${issue_number}`);
+                await github.rest.issues.addLabels({
+                  owner,
+                  repo,
+                  issue_number,
+                  labels: ['Conflictos']
+                });
+              } else if (data.mergeable === true) {
+                console.log(`Removing "Conflictos" label from PR #${issue_number} (if exists)`);
+                try {
+                  await github.rest.issues.removeLabel({
+                    owner,
+                    repo,
+                    issue_number,
+                    name: 'Conflictos'
+                  });
+                } catch (e) {
+                  // label no existía
+                }
+              }
+            }
+
+            if (context.eventName === 'pull_request') {
+              await checkPR(context.payload.pull_request);
+            }
+
+            if (context.eventName === 'push') {
+              const { data: prs } = await github.rest.pulls.list({
+                owner,
+                repo,
+                state: 'open',
+                base: 'master'
+              });
+
+              for (const pr of prs) {
+                await checkPR(pr);
+              }
+            }

Business/Data/AutoAnalizador/RealItem.cs

@@ -0,0 +1,127 @@
+/*
+insert license info here
+*/
+using System;
+using System.Collections;
+
+namespace Business.Data.AutoAnalizador
+{
+	/// <summary>
+	///	Generated by MyGeneration using the NHibernate Object Mapping template
+	/// </summary>
+	[Serializable]
+	public sealed class RealItem: Business.BaseDataAccess
+	{
+
+		#region Private Members
+		private bool m_isChanged;
+
+		private int m_idrealitem; 
+		private string m_idreal; 
+		private int m_iditem; 
+		private bool m_habilitado; 		
+		#endregion
+
+		#region Default ( Empty ) Class Constuctor
+		/// <summary>
+		/// default constructor
+		/// </summary>
+		public RealItem()
+		{
+            m_idrealitem = 0;
+            m_idreal = String.Empty; 
+			m_iditem = 0; 
+			m_habilitado = false; 
+		}
+		#endregion // End of Default ( Empty ) Class Constuctor
+
+		#region Required Fields Only Constructor
+		/// <summary>
+		/// required (not null) fields only constructor
+		/// </summary>
+		public RealItem(
+			string idreal, 
+			int iditem, 
+			bool habilitado)
+			: this()
+		{
+            m_idreal = idreal;
+			m_iditem = iditem;
+			m_habilitado = habilitado;
+		}
+		#endregion // End Required Fields Only Constructor
+
+		#region Public Properties
+
+		/// <summary>
+		/// 
+		/// </summary>
+		public int IdRealItem
+		{
+			get { return m_idrealitem; }
+			set
+			{
+				m_isChanged |= (m_idrealitem != value );
+                m_idrealitem = value;
+			}
+
+		}
+
+		/// <summary>
+		/// 
+		/// </summary>
+		public string IdReal
+		{
+			get { return m_idreal; }
+
+			set	
+			{	
+				if( value == null )
+					throw new ArgumentOutOfRangeException("Null value not allowed for IdReal", value, "null");
+
+				if(  value.Length > 50)
+					throw new ArgumentOutOfRangeException("Invalid value for IdReal", value, value.ToString());
+
+				m_isChanged |= (m_idreal != value); m_idreal = value;
+			}
+		}
+
+		/// <summary>
+		/// 
+		/// </summary>
+		public int IdItem
+		{
+			get { return m_iditem; }
+			set
+			{
+				m_isChanged |= ( m_iditem != value ); 
+				m_iditem = value;
+			}
+
+		}
+
+		/// <summary>
+		/// 
+		/// </summary>
+		public bool Habilitado
+		{
+			get { return m_habilitado; }
+			set
+			{
+				m_isChanged |= ( m_habilitado != value ); 
+				m_habilitado = value;
+			}
+
+		}
+
+		/// <summary>
+		/// Returns whether or not the object has changed it's values.
+		/// </summary>
+		public bool IsChanged
+		{
+			get { return m_isChanged; }
+		}
+
+		#endregion 
+	}
+}

Business/Data/AutoAnalizador/RealItem.hbm.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<hibernate-mapping xmlns="urn:nhibernate-mapping-2.0">
+	<class name="Business.Data.AutoAnalizador.RealItem,Business" table="LAB_RealItem">
+
+		<id name="IdRealItem" column="idRealItem" type="Int32" unsaved-value="0">
+			<generator class="native"/>
+		</id>
+		<property column="idReal" type="String" name="IdReal" not-null="true" length="50" />
+		<property column="idItem" type="Int32" name="IdItem" not-null="true" />
+		<property column="habilitado" type="Boolean" name="Habilitado" not-null="true" />
+
+	</class>
+</hibernate-mapping>

Business/Data/Laboratorio/AuditoriaUsuario.cs

@@ -24,7 +24,9 @@ public sealed class AuditoriaUsuario : Business.BaseDataAccess
 		private string m_accion; 
 		private string m_username; 
 
-		private int m_idusuarioregistro; 		
+		private int m_idusuarioregistro;
+		private string m_valorNuevo;
+		private string m_valorAnterior;
 		#endregion
 
 		#region Default ( Empty ) Class Constuctor
@@ -193,7 +195,29 @@ public bool IsChanged
 		{
 			get { return m_isChanged; }
 		}
-
-		#endregion 
+		public string ValorNuevo
+		{
+			get { return m_valorNuevo; }
+			set
+			{
+				if (value != null && value.Length > 500)
+					throw new ArgumentOutOfRangeException("Invalid value for Valor Nuevo", value, value.ToString());
+
+				m_isChanged |= (m_valorNuevo != value); m_valorNuevo = value;
+			}
+		}
+
+		public string ValorAnterior
+		{
+			get { return m_valorAnterior; }
+			set
+			{
+				if (value != null && value.Length > 500)
+					throw new ArgumentOutOfRangeException("Invalid value for Valor Anterior", value, value.ToString());
+
+				m_isChanged |= (m_valorAnterior != value); m_valorAnterior = value;
+			}
+		}
+		#endregion
 	}
 }

Business/Data/Laboratorio/AuditoriaUsuario.hbm.xml

@@ -12,6 +12,7 @@
 		<property column="accion" type="String" name="Accion" not-null="true" length="400" />
 
 		<property column="idUsuarioRegistro" type="Int32" name="IdUsuarioRegistro" not-null="true" />
-
+    <property column="valorAnterior" type="String" name="ValorAnterior" length="500" />
+    <property column="valorNuevo" type="String" name="ValorNuevo" length="500" />
 	</class>
 </hibernate-mapping>