Merge branch 'main' of http://192.168.40.251:3000/jsoto/MBS
This commit is contained in:
Abel López
Binary file not shown.
+14
-9
@@ -158,11 +158,19 @@
|
||||
<Configuration binaryName="CreateDatabase" id="-341630738" label="CreateDatabase"/>
|
||||
</Application>
|
||||
</Group>
|
||||
<Group id="1339562636" label="DOCUMENTACION" language="Genero">
|
||||
<Library binaryName="SCRIPTS" id="-1793415793" label="SCRIPTS">
|
||||
<File filePath="../scripts/build_mbs.cmd"/>
|
||||
<File filePath="../scripts/deploy_mbs.cmd"/>
|
||||
<File filePath="../scripts/README.md"/>
|
||||
</Library>
|
||||
</Group>
|
||||
<Group environment="value:CLASSPATH=$(ProjectDir)\\classes\\javax.mail.jar;$(CLASSPATH)" id="788649802" label="MODULOS" language="Genero">
|
||||
<Group id="446189093" label="ACTIVOS FIJOS">
|
||||
<Library binaryName="FORMULARIOS_AC" id="749078683" label="FORMULARIOS_AC"/>
|
||||
<Library binaryName="FUNCIONES_AC" id="1581383228" label="FUNCIONES_AC"/>
|
||||
</Group>
|
||||
<Group id="634755826" label="COMPRAS"/>
|
||||
<Group id="-1298100213" label="CONTABILIDAD GENERAL">
|
||||
<Application binaryName="cgprmt001" dependencies="2055924299,-1026233879" id="-1385997751" label="cgprmt001">
|
||||
<Configuration id="-340886821" label="Configuration"/>
|
||||
@@ -596,9 +604,9 @@
|
||||
</Group>
|
||||
</Group>
|
||||
<Group id="128554475" label="Packages" language="Genero">
|
||||
<Package binaryName="Application_GAR" dependencies="159917928,212784684,400358049" id="9486100" label="Application_GAR" platform="Genero Application Server">
|
||||
<DynamicProperty name="packageId" value="myapp"/>
|
||||
<DynamicProperty name="packageLabel" value="MyApp"/>
|
||||
<Package binaryName="mbs" dependencies="159917928,212784684,400358049" id="9486100" label="mbs" platform="Genero Application Server">
|
||||
<DynamicProperty name="packageId" value="mbsERP"/>
|
||||
<DynamicProperty name="packageLabel" value="mbsERP"/>
|
||||
<Directory excludedFiles="Test.42r,*.4pdb" includedFiles="*.42?" label="Binaries" sourceDirectory="$(ProjectDir)/bin"/>
|
||||
<Directory includedFiles="fglprofile,*.xcf,MANIFEST" label="Config" sourceDirectory="$(ProjectDir)/config"/>
|
||||
<Directory includedFiles="*.png,*.jpg,*.ttf,*.svg,image2font.txt" label="Images" sourceDirectory="$(ProjectDir)/images"/>
|
||||
@@ -608,17 +616,14 @@
|
||||
</Package>
|
||||
</Group>
|
||||
<Group environment="dirlist:DBPATH=$(ProjectDir)/database;$(DBPATH)" id="1114580" label="Project" language="Genero">
|
||||
<Library binaryName="Entities" id="212784684" label="Entities"/>
|
||||
<Application binaryName="MAINMENU" dependencies="159917928,212784684,-1026233879,-764824792" environment="dirlist:FGLIMAGEPATH=$(ProjectDir)/images;$(FGLDIR)/lib/image2font.txt;$(ProjectDir);$(FGLIMAGEPATH)" id="400358049" label="MAINMENU">
|
||||
<Configuration binaryName="MAINMENU" id="1399885202" label="mainmenu"/>
|
||||
<Application binaryName="Application" dependencies="159917928,212784684,-1026233879,-764824792,-902110420" environment="dirlist:FGLIMAGEPATH=$(ProjectDir)/images;$(FGLDIR)/lib/image2font.txt;$(ProjectDir);$(FGLIMAGEPATH)" id="400358049" label="Application">
|
||||
<Configuration binaryName="MAINMENU" id="1399885202" label="configuration"/>
|
||||
<File filePath="otrodir/MainMenu.4gl"/>
|
||||
</Application>
|
||||
<Library binaryName="Entities" id="212784684" label="Entities"/>
|
||||
<Library binaryName="Resources" id="159917928" label="Resources">
|
||||
<File filePath="resources/myactions.4ad"/>
|
||||
<File filePath="resources/mystyles.4st"/>
|
||||
</Library>
|
||||
<Application binaryName="Test" dependencies="400358049" id="547110977" label="Test" targetDirectory="$(ProjectDir)/testbin">
|
||||
<GGCConfiguration ggcMode="tcp" id="1795918727" label="Test"/>
|
||||
</Application>
|
||||
</Group>
|
||||
</Project>
|
||||
@@ -0,0 +1,98 @@
|
||||
<StyleList>
|
||||
<Style name="Window" >
|
||||
<StyleAttribute value="normal" name="windowType" />
|
||||
</Style>
|
||||
<Style name="Window.main" >
|
||||
<StyleAttribute value="normal" name="windowType" />
|
||||
<StyleAttribute value="menu" name="startMenuPosition" />
|
||||
</Style>
|
||||
<Style name="Window.main-mbs" >
|
||||
<StyleAttribute value="center" name="position" />
|
||||
<StyleAttribute value="normal" name="windowType" />
|
||||
<StyleAttribute value="none" name="actionPanelPosition" />
|
||||
<StyleAttribute value="none" name="ringMenuPosition" />
|
||||
<StyleAttribute value="none" name="statusBarType" />
|
||||
</Style>
|
||||
<Style name="Window.dialog" >
|
||||
<StyleAttribute value="modal" name="windowType" />
|
||||
<StyleAttribute value="no" name="sizable" />
|
||||
<StyleAttribute value="center" name="position" />
|
||||
<StyleAttribute value="bottom" name="actionPanelPosition" />
|
||||
<StyleAttribute value="bottom" name="ringMenuPosition" />
|
||||
<StyleAttribute value="none" name="toolBarPosition" />
|
||||
<StyleAttribute value="none" name="statusBarType" />
|
||||
<StyleAttribute value="popup" name="errorMessagePosition" />
|
||||
</Style>
|
||||
<Style name="Window.dialog2" >
|
||||
<StyleAttribute value="modal" name="windowType" />
|
||||
<StyleAttribute value="no" name="sizable" />
|
||||
<StyleAttribute value="center" name="position" />
|
||||
<StyleAttribute value="none" name="actionPanelPosition" />
|
||||
<StyleAttribute value="none" name="ringMenuPosition" />
|
||||
<StyleAttribute value="none" name="toolBarPosition" />
|
||||
<StyleAttribute value="none" name="statusBarType" />
|
||||
<StyleAttribute value="popup" name="errorMessagePosition" />
|
||||
</Style>
|
||||
<Style name="Window.dialog3" >
|
||||
<StyleAttribute value="modal" name="windowType" />
|
||||
<StyleAttribute value="yes" name="sizable" />
|
||||
<StyleAttribute value="none" name="toolBarPosition" />
|
||||
<StyleAttribute value="none" name="actionPanelPosition" />
|
||||
<StyleAttribute value="none" name="ringMenuPosition" />
|
||||
<StyleAttribute value="none" name="statusBarType" />
|
||||
<StyleAttribute value="popup" name="errorMessagePosition" />
|
||||
</Style>
|
||||
<Style name="Window.dialog4" >
|
||||
<StyleAttribute value="modal" name="windowType" />
|
||||
<StyleAttribute value="yes" name="sizable" />
|
||||
<StyleAttribute value="bottom" name="actionPanelPosition" />
|
||||
<StyleAttribute value="none" name="ringMenuPosition" />
|
||||
<StyleAttribute value="none" name="statusBarType" />
|
||||
<StyleAttribute value="popup" name="errorMessagePosition" />
|
||||
</Style>
|
||||
<Style name="Window.naked" >
|
||||
<StyleAttribute value="modal" name="windowType" />
|
||||
<StyleAttribute value="tool" name="border" />
|
||||
<StyleAttribute value="none" name="actionPanelPosition" />
|
||||
<StyleAttribute value="none" name="ringMenuPosition" />
|
||||
<StyleAttribute value="none" name="toolBarPosition" />
|
||||
<StyleAttribute value="none" name="statusBarType" />
|
||||
</Style>
|
||||
<Style name="Window.viewer" >
|
||||
<StyleAttribute value="modal" name="windowType" />
|
||||
<StyleAttribute value="yes" name="windowSystemMenu" />
|
||||
<StyleAttribute value="no" name="windowOptionMinimize" />
|
||||
<StyleAttribute value="no" name="windowOptionMaximize" />
|
||||
<StyleAttribute value="yes" name="sizable" />
|
||||
<StyleAttribute value="none" name="actionPanelPosition" />
|
||||
<StyleAttribute value="none" name="ringMenuPosition" />
|
||||
<StyleAttribute value="none" name="toolBarPosition" />
|
||||
<StyleAttribute value="none" name="statusBarType" />
|
||||
</Style>
|
||||
<Style name="edit:title" >
|
||||
<StyleAttribute value="large" name="fontSize" />
|
||||
<StyleAttribute value="fantasy" name="fontFamily" />
|
||||
<StyleAttribute value="bold" name="textDecoration" />
|
||||
</Style>
|
||||
<Style name="programas" >
|
||||
<StyleAttribute value="large" name="fontSize" />
|
||||
<StyleAttribute value="fantasy" name="fontFamily" />
|
||||
<StyleAttribute value="bold" name="textDecoration" />
|
||||
</Style>
|
||||
<Style name="Label:title" >
|
||||
<StyleAttribute value="sans-serif" name="fontFamily" />
|
||||
<StyleAttribute value="large" name="fontSize" />
|
||||
<StyleAttribute value="normal" name="fontStyle" />
|
||||
<StyleAttribute value="bold" name="fontWeight" />
|
||||
</Style>
|
||||
<Style name="Table:focus" >
|
||||
<StyleAttribute value="#7E0C6E" name="highlightColor" />
|
||||
</Style>
|
||||
<Style name="Table.detail:even" >
|
||||
<StyleAttribute value="#DECFDB" name="backgroundColor" />
|
||||
</Style>
|
||||
<Style name="Image.title" >
|
||||
<StyleAttribute value="no" name="border" />
|
||||
</Style>
|
||||
</StyleList>
|
||||
|
||||
@@ -0,0 +1,41 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!-- MBS ERP - Look&Feel A : "Marmo" (marca corporativa, purpura) -->
|
||||
<StyleList>
|
||||
<Style name="Window"><StyleAttribute name="windowType" value="normal" /></Style>
|
||||
<Style name="Window.main">
|
||||
<StyleAttribute name="windowType" value="normal" />
|
||||
<StyleAttribute name="startMenuPosition" value="menu" />
|
||||
</Style>
|
||||
<Style name="Window.main-mbs">
|
||||
<StyleAttribute name="position" value="center" />
|
||||
<StyleAttribute name="windowType" value="normal" />
|
||||
<StyleAttribute name="backgroundColor" value="#FFFFFF" />
|
||||
<StyleAttribute name="actionPanelPosition" value="none" />
|
||||
<StyleAttribute name="ringMenuPosition" value="none" />
|
||||
<StyleAttribute name="statusBarType" value="none" />
|
||||
</Style>
|
||||
<Style name="Window.dialog">
|
||||
<StyleAttribute name="windowType" value="modal" />
|
||||
<StyleAttribute name="sizable" value="no" />
|
||||
<StyleAttribute name="position" value="center" />
|
||||
<StyleAttribute name="actionPanelPosition" value="bottom" />
|
||||
<StyleAttribute name="ringMenuPosition" value="bottom" />
|
||||
<StyleAttribute name="toolBarPosition" value="none" />
|
||||
<StyleAttribute name="statusBarType" value="none" />
|
||||
<StyleAttribute name="errorMessagePosition" value="popup" />
|
||||
</Style>
|
||||
<Style name="Label:title">
|
||||
<StyleAttribute name="fontSize" value="xx-large" />
|
||||
<StyleAttribute name="fontFamily" value="sans-serif" />
|
||||
<StyleAttribute name="fontWeight" value="bold" />
|
||||
<StyleAttribute name="textColor" value="#7E0C6E" />
|
||||
</Style>
|
||||
<Style name="Table:focus">
|
||||
<StyleAttribute name="highlightColor" value="#7E0C6E" />
|
||||
<StyleAttribute name="highlightTextColor" value="#FFFFFF" />
|
||||
</Style>
|
||||
<Style name="Table.detail:even">
|
||||
<StyleAttribute name="backgroundColor" value="#DECFDB" />
|
||||
</Style>
|
||||
<Style name="Image.title"><StyleAttribute name="border" value="no" /></Style>
|
||||
</StyleList>
|
||||
@@ -0,0 +1,48 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!-- MBS ERP - Look&Feel B : "Claro / Dashboard" (azul, aireado) -->
|
||||
<StyleList>
|
||||
<Style name="Window"><StyleAttribute name="windowType" value="normal" /></Style>
|
||||
<Style name="Window.main">
|
||||
<StyleAttribute name="windowType" value="normal" />
|
||||
<StyleAttribute name="startMenuPosition" value="menu" />
|
||||
</Style>
|
||||
<Style name="Window.main-mbs">
|
||||
<StyleAttribute name="position" value="center" />
|
||||
<StyleAttribute name="windowType" value="normal" />
|
||||
<StyleAttribute name="backgroundColor" value="#F4F6FB" />
|
||||
<StyleAttribute name="actionPanelPosition" value="none" />
|
||||
<StyleAttribute name="ringMenuPosition" value="none" />
|
||||
<StyleAttribute name="statusBarType" value="none" />
|
||||
</Style>
|
||||
<Style name="Window.dialog">
|
||||
<StyleAttribute name="windowType" value="modal" />
|
||||
<StyleAttribute name="sizable" value="no" />
|
||||
<StyleAttribute name="position" value="center" />
|
||||
<StyleAttribute name="actionPanelPosition" value="bottom" />
|
||||
<StyleAttribute name="ringMenuPosition" value="bottom" />
|
||||
<StyleAttribute name="toolBarPosition" value="none" />
|
||||
<StyleAttribute name="statusBarType" value="none" />
|
||||
<StyleAttribute name="errorMessagePosition" value="popup" />
|
||||
</Style>
|
||||
<Style name="Label:title">
|
||||
<StyleAttribute name="fontSize" value="xx-large" />
|
||||
<StyleAttribute name="fontFamily" value="sans-serif" />
|
||||
<StyleAttribute name="fontWeight" value="bold" />
|
||||
<StyleAttribute name="textColor" value="#1E3A8A" />
|
||||
</Style>
|
||||
<Style name="Table:focus">
|
||||
<StyleAttribute name="highlightColor" value="#2563EB" />
|
||||
<StyleAttribute name="highlightTextColor" value="#FFFFFF" />
|
||||
</Style>
|
||||
<Style name="Table.detail:even">
|
||||
<StyleAttribute name="backgroundColor" value="#E8EEF9" />
|
||||
</Style>
|
||||
<Style name="Table.detail:odd">
|
||||
<StyleAttribute name="backgroundColor" value="#FFFFFF" />
|
||||
</Style>
|
||||
<Style name="TextEdit">
|
||||
<StyleAttribute name="backgroundColor" value="#FFFFFF" />
|
||||
<StyleAttribute name="textColor" value="#334155" />
|
||||
</Style>
|
||||
<Style name="Image.title"><StyleAttribute name="border" value="no" /></Style>
|
||||
</StyleList>
|
||||
@@ -0,0 +1,38 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!-- MBS ERP - Look&Feel C : "Nativo" (GBC neutro, con action panel) -->
|
||||
<StyleList>
|
||||
<Style name="Window"><StyleAttribute name="windowType" value="normal" /></Style>
|
||||
<Style name="Window.main">
|
||||
<StyleAttribute name="windowType" value="normal" />
|
||||
<StyleAttribute name="startMenuPosition" value="menu" />
|
||||
</Style>
|
||||
<Style name="Window.main-mbs">
|
||||
<StyleAttribute name="position" value="center" />
|
||||
<StyleAttribute name="windowType" value="normal" />
|
||||
<StyleAttribute name="actionPanelPosition" value="right" />
|
||||
<StyleAttribute name="ringMenuPosition" value="none" />
|
||||
<StyleAttribute name="statusBarType" value="default" />
|
||||
</Style>
|
||||
<Style name="Window.dialog">
|
||||
<StyleAttribute name="windowType" value="modal" />
|
||||
<StyleAttribute name="sizable" value="no" />
|
||||
<StyleAttribute name="position" value="center" />
|
||||
<StyleAttribute name="actionPanelPosition" value="bottom" />
|
||||
<StyleAttribute name="ringMenuPosition" value="bottom" />
|
||||
<StyleAttribute name="toolBarPosition" value="none" />
|
||||
<StyleAttribute name="statusBarType" value="none" />
|
||||
<StyleAttribute name="errorMessagePosition" value="popup" />
|
||||
</Style>
|
||||
<Style name="Label:title">
|
||||
<StyleAttribute name="fontSize" value="x-large" />
|
||||
<StyleAttribute name="fontFamily" value="sans-serif" />
|
||||
</Style>
|
||||
<Style name="Table:focus">
|
||||
<StyleAttribute name="highlightColor" value="#316AC5" />
|
||||
<StyleAttribute name="highlightTextColor" value="#FFFFFF" />
|
||||
</Style>
|
||||
<Style name="Table.detail:even">
|
||||
<StyleAttribute name="backgroundColor" value="#F0F0F0" />
|
||||
</Style>
|
||||
<Style name="Image.title"><StyleAttribute name="border" value="no" /></Style>
|
||||
</StyleList>
|
||||
@@ -0,0 +1,57 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!-- MBS ERP - Look&Feel D : "Oscuro" (re-skin dark) -->
|
||||
<StyleList>
|
||||
<Style name="Window"><StyleAttribute name="windowType" value="normal" /></Style>
|
||||
<Style name="Window.main">
|
||||
<StyleAttribute name="windowType" value="normal" />
|
||||
<StyleAttribute name="startMenuPosition" value="menu" />
|
||||
</Style>
|
||||
<Style name="Window.main-mbs">
|
||||
<StyleAttribute name="position" value="center" />
|
||||
<StyleAttribute name="windowType" value="normal" />
|
||||
<StyleAttribute name="backgroundColor" value="#1E1E1E" />
|
||||
<StyleAttribute name="textColor" value="#E0E0E0" />
|
||||
<StyleAttribute name="actionPanelPosition" value="none" />
|
||||
<StyleAttribute name="ringMenuPosition" value="none" />
|
||||
<StyleAttribute name="statusBarType" value="none" />
|
||||
</Style>
|
||||
<Style name="Window.dialog">
|
||||
<StyleAttribute name="windowType" value="modal" />
|
||||
<StyleAttribute name="sizable" value="no" />
|
||||
<StyleAttribute name="position" value="center" />
|
||||
<StyleAttribute name="actionPanelPosition" value="bottom" />
|
||||
<StyleAttribute name="ringMenuPosition" value="bottom" />
|
||||
<StyleAttribute name="toolBarPosition" value="none" />
|
||||
<StyleAttribute name="statusBarType" value="none" />
|
||||
<StyleAttribute name="errorMessagePosition" value="popup" />
|
||||
</Style>
|
||||
<Style name="Label:title">
|
||||
<StyleAttribute name="fontSize" value="xx-large" />
|
||||
<StyleAttribute name="fontFamily" value="sans-serif" />
|
||||
<StyleAttribute name="fontWeight" value="bold" />
|
||||
<StyleAttribute name="textColor" value="#BB86FC" />
|
||||
</Style>
|
||||
<Style name="Table">
|
||||
<StyleAttribute name="backgroundColor" value="#252526" />
|
||||
<StyleAttribute name="textColor" value="#E0E0E0" />
|
||||
</Style>
|
||||
<Style name="Table:focus">
|
||||
<StyleAttribute name="highlightColor" value="#BB86FC" />
|
||||
<StyleAttribute name="highlightTextColor" value="#1E1E1E" />
|
||||
</Style>
|
||||
<Style name="Table.detail:even">
|
||||
<StyleAttribute name="backgroundColor" value="#2A2A2A" />
|
||||
</Style>
|
||||
<Style name="Table.detail:odd">
|
||||
<StyleAttribute name="backgroundColor" value="#252526" />
|
||||
</Style>
|
||||
<Style name="TextEdit">
|
||||
<StyleAttribute name="backgroundColor" value="#252526" />
|
||||
<StyleAttribute name="textColor" value="#E0E0E0" />
|
||||
</Style>
|
||||
<Style name="Edit">
|
||||
<StyleAttribute name="backgroundColor" value="#2A2A2A" />
|
||||
<StyleAttribute name="textColor" value="#E0E0E0" />
|
||||
</Style>
|
||||
<Style name="Image.title"><StyleAttribute name="border" value="no" /></Style>
|
||||
</StyleList>
|
||||
@@ -1,7 +1,7 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<ManagedForm fileVersion="31400" gstVersion="31405" name="managedform" uid="{2a2f5d94-27e9-449e-8e28-d44bc864ab8d}">
|
||||
<ManagedForm databaseName="smarmotech" fileVersion="40100" gstVersion="60003" name="managedform" uid="{2a2f5d94-27e9-449e-8e28-d44bc864ab8d}">
|
||||
<AGSettings>
|
||||
<DynamicProperties version="2"/>
|
||||
<DynamicProperties version="4"/>
|
||||
</AGSettings>
|
||||
<Record name="record1" uid="{a3f5a6f0-5f52-41d7-899d-187eda80ece5}">
|
||||
<RecordField fieldIdRef="1" name="tipo_cliente" uid="{babb035b-c8a1-4bc8-adfb-df378659869c}"/>
|
||||
@@ -32,7 +32,7 @@
|
||||
<Edit fieldId="3" gridHeight="1" gridWidth="40" name="nom_cliente" noEntry="true" posX="20" posY="1" tabIndex="-1" title="edit3" widget="Edit"/>
|
||||
</Group>
|
||||
<Group gridChildrenInParent="false" gridHeight="10" gridWidth="85" name="group9" posX="1" posY="5" text="documentos">
|
||||
<Table fontPitch="variable" gridHeight="6" gridWidth="83" height="15" name="table4" posX="1" posY="1" totalRows="5" wantFixedPageSize="true" width="36">
|
||||
<Table fontPitch="variable" gridHeight="6" gridWidth="83" height="15" name="table4" posX="1" posY="1" stretch="x" totalRows="5" width="36">
|
||||
<Edit fieldId="4" gridHeight="1" gridWidth="15" name="nombre_file_foto" noEntry="true" posX="0" posY="0" scroll="true" tabIndex="-1" title="Nombre Archivo" widget="Edit"/>
|
||||
<Edit fieldId="5" gridHeight="1" gridWidth="21" length="100" name="filedestino" noEntry="true" posX="15" posY="0" scroll="true" tabIndex="-1" title="Ruta" widget="Edit"/>
|
||||
<Edit fieldId="6" gridHeight="1" gridWidth="8" hidden="true" name="data" posX="36" posY="0" scroll="true" tabIndex="-1" title="edit1" widget="Edit"/>
|
||||
@@ -52,6 +52,6 @@
|
||||
</Grid>
|
||||
</Form>
|
||||
<DiagramLayout>
|
||||
<![CDATA[AAAAAgAAAEwAewA2AGUANQA4AGMAMwAyADEALQBhAGQAMwA2AC0ANAA3ADIAZAAtAGIAOAA5AGEALQA5AGUAZQBhADAAMABiAGEAZgAwADIAOAB9QCAAAAgAAAFAIAAACAAAAQAAAAAAAAAAAQAAAEwAewBhADMAZgA1AGEANgBmADAALQA1AGYANQAyAC0ANAAxAGQANwAtADgAOQA5AGQALQAxADgANwBlAGQAYQA4ADAAZQBjAGUANQB9AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQ==]]>
|
||||
<![CDATA[AAAAAgAAAEwAewBhADMAZgA1AGEANgBmADAALQA1AGYANQAyAC0ANAAxAGQANwAtADgAOQA5AGQALQAxADgANwBlAGQAYQA4ADAAZQBjAGUANQB9AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAEwAewA2AGUANQA4AGMAMwAyADEALQBhAGQAMwA2AC0ANAA3ADIAZAAtAGIAOAA5AGEALQA5AGUAZQBhADAAMABiAGEAZgAwADIAOAB9QCAAAAgAAAFAIAAACAAAAQAAAAAAAAAAAQ==]]>
|
||||
</DiagramLayout>
|
||||
</ManagedForm>
|
||||
@@ -1,7 +1,7 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<ManagedForm databaseName="rayovac" fileVersion="31400" gstVersion="31408" name="ManagedForm" uid="{e7bf5ee8-9cf5-4949-8822-f219adf592ae}">
|
||||
<ManagedForm databaseName="smarmotech" fileVersion="40100" gstVersion="60003" name="ManagedForm" uid="{e7bf5ee8-9cf5-4949-8822-f219adf592ae}">
|
||||
<AGSettings>
|
||||
<DynamicProperties version="2"/>
|
||||
<DynamicProperties version="4"/>
|
||||
</AGSettings>
|
||||
<Record additionalTables="" joinLeft="" joinOperator="" joinRight="" name="Undefined" order="" uid="{64b5eafa-5fc7-4d80-b55b-f425271c2a7a}" where="">
|
||||
<RecordField colName="codigo_grupo" fieldIdRef="1" fieldType="TABLE_COLUMN" name="vetb00052.codigo_grupo" sqlTabName="vetb00052" sqlType="SMALLINT" table_alias_name="" uid="{8daa263a-b05e-47ae-8647-f06c4c1829b8}"/>
|
||||
@@ -77,6 +77,6 @@
|
||||
</Folder>
|
||||
</Form>
|
||||
<DiagramLayout>
|
||||
<![CDATA[AAAAAgAAAEwAewAxADgAMQAxAGIAMQAyAGIALQAyADIANgA3AC0ANABhAGQAMQAtADgAMQA1AGYALQBlAGIAOAAxAGUAYgA5ADgAMgAzADUAOAB9QHMAACrAACrAY+ZmkyzM+j+GhysCDEm8AQAAAEwAewA2ADQAYgA1AGUAYQBmAGEALQA1AGYAYwA3AC0ANABkADgAMAAtAGIANQA1AGIALQBmADQAMgA1ADIANwAxAGMAMgBhADcAYQB9QFrMzQmZmdbAb7MzekZmqz+Ik3S8an78AQAAAEwAewBjAGIANQAxADQAZgA1AGEALQBhAGIAOQBkAC0ANAAxAGMAZgAtAGEAMAA1ADEALQA3ADcAYQA3ADcAZAAzADcAZAA3ADUANwB9QGzMzQ2ZmdtASmZmoczNCD+EeuFHrhR8AQ==]]>
|
||||
<![CDATA[AAAAAgAAAEwAewA2ADQAYgA1AGUAYQBmAGEALQA1AGYAYwA3AC0ANABkADgAMAAtAGIANQA1AGIALQBmADQAMgA1ADIANwAxAGMAMgBhADcAYQB9QFrMzQmZmdbAb7MzekZmqz+Ik3S8an78AQAAAEwAewAxADgAMQAxAGIAMQAyAGIALQAyADIANgA3AC0ANABhAGQAMQAtADgAMQA1AGYALQBlAGIAOAAxAGUAYgA5ADgAMgAzADUAOAB9QHMAACrAACrAY+ZmkyzM+j+GhysCDEm8AQAAAEwAewBjAGIANQAxADQAZgA1AGEALQBhAGIAOQBkAC0ANAAxAGMAZgAtAGEAMAA1ADEALQA3ADcAYQA3ADcAZAAzADcAZAA3ADUANwB9QGzMzQ2ZmdtASmZmoczNCD+EeuFHrhR8AQ==]]>
|
||||
</DiagramLayout>
|
||||
</ManagedForm>
|
||||
@@ -0,0 +1,47 @@
|
||||
# Scripts de build & deploy — Menú MBS (Genero 6 / GAS)
|
||||
|
||||
Automatizan el flujo **fuente (Git) → GAR → GAS**. Reemplazan el viejo folder
|
||||
compartido de binarios. Solo **una persona** (release manager, Jhonny) despliega a
|
||||
`.251`/producción, siempre desde fuente ya pulled de Git.
|
||||
|
||||
## Máquinas
|
||||
| Script | Dónde se corre | Qué hace |
|
||||
|---|---|---|
|
||||
| `build_mbs.cmd` | **PC con Genero Studio 6.00.03** (tiene `gsmake`) | `git pull` + compila el GAR → `PROYECTO\distbin\mbs.gar` |
|
||||
| `deploy_mbs.cmd` | **Server `.251`** (consola donde corre `gasadmin`) | quita la versión anterior + despliega + habilita el GAR |
|
||||
|
||||
> `.251` **no tiene GST**, por eso el build va en una PC con GST y el deploy en el server.
|
||||
|
||||
## Flujo completo
|
||||
1. **En tu PC** (con GST):
|
||||
```
|
||||
scripts\build_mbs.cmd
|
||||
```
|
||||
- Ajusta primero dentro del script: `REPO` (tu clon, ej. `C:\MBS`) y `GSMAKE` (ruta de tu GST).
|
||||
- Produce `PROYECTO\distbin\mbs.gar`.
|
||||
- (Opcional) descomenta `DEST` para que lo copie a un share del server.
|
||||
|
||||
2. **Lleva `mbs.gar` al server `.251`** (copia por share, o el medio que uses).
|
||||
|
||||
3. **En `.251`** (consola del GAS):
|
||||
```
|
||||
scripts\deploy_mbs.cmd C:\ruta\mbs.gar
|
||||
```
|
||||
- Hace: `disable` → `undeploy` → `clean-archives` → `deploy` → `enable`.
|
||||
- Los mensajes *"Command failed / No archive to disable"* en el **primer** deploy son **normales** (no había versión previa).
|
||||
|
||||
4. **Prueba**: `http://192.168.40.251:6394/ua/r/Application`
|
||||
(si reconstruiste con `BinaryName=MAINMENU`, la URL será `/ua/r/MAINMENU`).
|
||||
|
||||
## Notas
|
||||
- El **nombre del archive** lo toma `deploy_mbs.cmd` del nombre del `.gar`
|
||||
(`mbs.gar` → archive `mbs`). Si cambias el nombre del archivo, cambia el archive.
|
||||
- El `.gar` **no se versiona en Git** (es artefacto). Se transfiere aparte.
|
||||
- Si `gsmake` no arma el paquete, constrúyelo desde GST: clic derecho en el
|
||||
paquete **`mbs` → Build** (también deja el `.gar` en `PROYECTO\distbin\`).
|
||||
- **Recursos** (estilos `.4st`, imágenes): deben ir declarados como *Resources*
|
||||
de la app en GST para que el GAR los empaquete. Si falta un `.4st`, el DVM
|
||||
falla en runtime con `-8014 resource file ... can not be read`.
|
||||
- Camino "one-click remoto" (a futuro): instalar **Genero Studio Server** en `.251`
|
||||
y usar *Tools → Server Connections*; entonces GST despliega directo al GAS del
|
||||
server. Por ahora, estos 2 scripts son el flujo estable.
|
||||
@@ -0,0 +1,68 @@
|
||||
@echo off
|
||||
setlocal EnableExtensions
|
||||
REM ===========================================================================
|
||||
REM build_mbs.cmd - Baja lo ultimo de Git y compila el GAR del menu MBS
|
||||
REM
|
||||
REM >>> CORRER EN UNA PC CON GENERO STUDIO 6.00.03 (tiene gsmake) <<<
|
||||
REM
|
||||
REM Salida: <REPO>\PROYECTO\distbin\mbs.gar
|
||||
REM Luego ese .gar se lleva al server .251 y se corre deploy_mbs.cmd
|
||||
REM ===========================================================================
|
||||
|
||||
REM --- AJUSTA estas 2 rutas a tu PC ---
|
||||
set "REPO=C:\Users\jsoto\Documents\NACE\proyectos\Fuentes\MARMOTECH\"
|
||||
set "GSMAKE=C:\Program Files\FourJs\Genero Studio603\gst\bin\gsmake.exe"
|
||||
|
||||
REM --- (normalmente no cambian) ---
|
||||
set "PROJECT=%REPO%\PROYECTO\MBSerp_new3.4pw"
|
||||
set "GAROUT=%REPO%\PROYECTO\distbin\mbs.gar"
|
||||
|
||||
REM --- (OPCIONAL) copiar el GAR a un destino que vea el server .251 ---
|
||||
REM Ej: un share del server. Deja vacio para no copiar.
|
||||
set "DEST="
|
||||
REM set "DEST=\\192.168.40.251\deploy\mbs.gar"
|
||||
|
||||
if not exist "%GSMAKE%" (
|
||||
echo [ERROR] No existe gsmake en: "%GSMAKE%"
|
||||
echo Corrige la variable GSMAKE (ruta de tu Genero Studio).
|
||||
exit /b 1
|
||||
)
|
||||
if not exist "%PROJECT%" (
|
||||
echo [ERROR] No existe el proyecto: "%PROJECT%"
|
||||
echo Corrige REPO o el nombre del .4pw.
|
||||
exit /b 1
|
||||
)
|
||||
|
||||
echo --- 1) git pull ---
|
||||
pushd "%REPO%" || (echo [ERROR] No existe %REPO% & exit /b 1)
|
||||
git pull
|
||||
popd
|
||||
|
||||
echo(
|
||||
echo --- 2) Compilando GAR con gsmake ---
|
||||
"%GSMAKE%" "%PROJECT%"
|
||||
if errorlevel 1 (
|
||||
echo [ERROR] gsmake fallo. Abre el proyecto en GST y revisa los errores de build.
|
||||
exit /b 1
|
||||
)
|
||||
|
||||
if not exist "%GAROUT%" (
|
||||
echo [ERROR] No se genero el GAR esperado: %GAROUT%
|
||||
echo Si gsmake no arma el paquete, construyelo desde GST:
|
||||
echo clic derecho en el paquete "mbs" -^> Build
|
||||
echo (tambien deja el .gar en PROYECTO\distbin\)
|
||||
exit /b 1
|
||||
)
|
||||
echo [OK] GAR generado: %GAROUT%
|
||||
|
||||
if defined DEST (
|
||||
echo --- 3) Copiando a %DEST% ---
|
||||
copy /Y "%GAROUT%" "%DEST%"
|
||||
if errorlevel 1 echo [AVISO] No se pudo copiar a %DEST% (revisa el share/permiso^).
|
||||
)
|
||||
|
||||
echo(
|
||||
echo LISTO.
|
||||
echo GAR: %GAROUT%
|
||||
echo Ahora en el server .251: deploy_mbs.cmd "ruta\mbs.gar"
|
||||
endlocal
|
||||
@@ -0,0 +1,71 @@
|
||||
@echo off
|
||||
setlocal EnableExtensions
|
||||
REM ===========================================================================
|
||||
REM deploy_mbs.cmd - Despliega el GAR del menu MBS en el GAS de ESTE server
|
||||
REM
|
||||
REM >>> CORRER EN EL SERVER (.251), en la consola donde funciona 'gasadmin' <<<
|
||||
REM
|
||||
REM Uso: deploy_mbs.cmd [ruta\al\mbs.gar]
|
||||
REM Si no pasas ruta, busca mbs.gar en la carpeta actual.
|
||||
REM
|
||||
REM El nombre del ARCHIVE se toma del nombre del .gar (mbs.gar -> archive "mbs").
|
||||
REM ===========================================================================
|
||||
|
||||
set "GAR=%~1"
|
||||
if "%GAR%"=="" set "GAR=mbs.gar"
|
||||
set "HOST=192.168.40.251"
|
||||
set "PORT=6394"
|
||||
|
||||
if not exist "%GAR%" (
|
||||
echo [ERROR] No se encuentra el GAR: "%GAR%"
|
||||
echo Uso: %~nx0 [ruta\al\mbs.gar]
|
||||
exit /b 1
|
||||
)
|
||||
|
||||
REM --- nombre del archive = nombre del archivo sin extension ---
|
||||
for %%F in ("%GAR%") do set "ARCHIVE=%%~nF"
|
||||
|
||||
echo(
|
||||
echo ============================================================
|
||||
echo DEPLOY MBS GAR="%GAR%" ARCHIVE=%ARCHIVE%
|
||||
echo ============================================================
|
||||
|
||||
echo(
|
||||
echo --- 1) Estado actual ---
|
||||
gasadmin gar --list-archives
|
||||
|
||||
echo(
|
||||
echo --- 2) Quitando version anterior (los "Command failed / No archive" aqui son NORMALES en el 1er deploy) ---
|
||||
gasadmin gar --disable-archive %ARCHIVE%
|
||||
gasadmin gar --undeploy-archive %ARCHIVE% -y
|
||||
gasadmin gar --clean-archives
|
||||
|
||||
echo(
|
||||
echo --- 3) Desplegando nueva version ---
|
||||
gasadmin gar --deploy-archive "%GAR%" -y
|
||||
if errorlevel 1 (
|
||||
echo [ERROR] Fallo el deploy del GAR.
|
||||
exit /b 1
|
||||
)
|
||||
|
||||
echo(
|
||||
echo --- 4) Habilitando ---
|
||||
gasadmin gar --enable-archive %ARCHIVE%
|
||||
if errorlevel 1 (
|
||||
echo [ERROR] Fallo al habilitar el archive.
|
||||
exit /b 1
|
||||
)
|
||||
|
||||
echo(
|
||||
echo --- 5) Estado final ---
|
||||
gasadmin gar --list-archives
|
||||
|
||||
echo(
|
||||
echo ============================================================
|
||||
echo LISTO. Abre en el navegador:
|
||||
echo http://%HOST%:%PORT%/ua/r/Application
|
||||
echo ============================================================
|
||||
echo Nota: si reconstruiste con BinaryName=MAINMENU, la app se
|
||||
echo llamara MAINMENU y la URL sera /ua/r/MAINMENU
|
||||
echo(
|
||||
endlocal
|
||||
Reference in New Issue
Block a user