diff --git a/Application.cfc b/Application.cfc
index 765d131..ee243e6 100644
--- a/Application.cfc
+++ b/Application.cfc
@@ -38,7 +38,6 @@
-
--->
-
+
diff --git a/agreement.cfm b/agreement.cfm
index 88c9e14..08b282a 100644
--- a/agreement.cfm
+++ b/agreement.cfm
@@ -16,17 +16,17 @@
-
+
select coalesce(max(agreement_version)+1,0) as next_version
from agreement
- where contract_id=
+ where contract_id=
-
+
-
+
diff --git a/agreement_ls.cfm b/agreement_ls.cfm
index f02af51..7ab5aed 100644
--- a/agreement_ls.cfm
+++ b/agreement_ls.cfm
@@ -107,7 +107,7 @@ select count(*) as cnt from agreement where 1=1
-
+
@@ -122,9 +122,9 @@ select count(*) as cnt from agreement where 1=1
-
-
+
#gridFooter#
+ Создавать сделки (соглашения) нужно из договоров
diff --git a/etc/db/spec.sql b/etc/db/spec.sql
index 9b685c3..71ef883 100644
--- a/etc/db/spec.sql
+++ b/etc/db/spec.sql
@@ -1,7 +1,13 @@
-/*
+/*
+
*/
+/*
+ public
+ dbo ( ) appserver
+*/
+
--
drop table if exists measure CASCADE;
create table measure (
@@ -177,7 +183,7 @@ create table specification_item_version (
,dt_created timestamp NOT NULL default CURRENT_TIMESTAMP --
,dt_updated timestamp NOT NULL default CURRENT_TIMESTAMP --
,CONSTRAINT PK_specification_item_version PRIMARY KEY (specification_item_uid, agreement_version)
- ,CONSTRAINT CK_specification_item_version_dt CHECK NOT(dt_from IS NULL AND dt_to IS NULL)
+ ,CONSTRAINT CK_specification_item_version_dt CHECK (NOT(dt_from IS NULL AND dt_to IS NULL))
);
ALTER TABLE specification_item OWNER TO dbo;
-- ALTER TABLE specification_item_version ADD CONSTRAINT CK_specification_item_version_dt CHECK(NOT(dt_from IS NULL AND dt_to IS NULL));
@@ -439,4 +445,13 @@ insert into acl(obj,role_id,permission) values ('service_price',1,2);
insert into acl(obj,role_id,permission) values ('abstract_service_complementary',1,2); */
-
\ No newline at end of file
+grant usage on schema public to appserver;
+grant all on all tables in schema public to appserver;
+grant all on all sequences in schema public to appserver;
+
+/*
+select * from specification_item_version siv
+join specification_item si on (siv.specification_item_uid=si.specification_item_uid)
+join specification s on (si.specification_id=s.specification_id)
+join agreement a on (s.contract_id=a.contract_id AND siv.agreement_version=a.agreement_version)
+*/
\ No newline at end of file
diff --git a/etc/spec.txt b/etc/spec.txt
index d3aaa69..17d3eda 100644
--- a/etc/spec.txt
+++ b/etc/spec.txt
@@ -1,4 +1,24 @@
2025-06-16 10:58:02
+git remote add origin https://gitea.services.ngcloud.ru/smishchuk/spec.git
+
+root@dat-n-smishch1 MINGW64 /d/wwwroot/spec (master)
+$ git remote add origin https://gitea.services.ngcloud.ru/smishchuk/spec.git
+
+root@dat-n-smishch1 MINGW64 /d/wwwroot/spec (master)
+$ git push -u origin master
+remote: Verify
+fatal: Authentication failed for 'https://gitea.services.ngcloud.ru/smishchuk/spec.git/'
+
+Сгенерил ключ
+$ git remote set-url origin gitea@gitea.services.ngcloud.ru:smishchuk/spec.git
+
+root@dat-n-smishch1 MINGW64 /d/wwwroot/spec (master)
+$ git remote -v
+origin gitea@gitea.services.ngcloud.ru:smishchuk/spec.git (fetch)
+origin gitea@gitea.services.ngcloud.ru:smishchuk/spec.git (push)
+
+
+
Локально, чтобы не загаживать окружение, поместим переменные окружения в реестр [HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\lucee] "Environment"
2025-06-14 11:02:46
Центральный селект
diff --git a/specification_item_del.cfm b/specification_item_del.cfm
index 1c43457..714ea7b 100644
--- a/specification_item_del.cfm
+++ b/specification_item_del.cfm
@@ -57,7 +57,7 @@
usePRG="No"
pageInfo=#pageInfo#
id=""
- queryString="#request.thisPage#?specification_item_uid=#specification_item_uid#"
+ queryString="specification_item_uid=#specification_item_uid#"
defaultBackUrl="specification.cfm?specification_id=#d.specification_item_id#"
status=#pageInfo.status#
trackOut="tr"
diff --git a/specification_item_version.cfm b/specification_item_version.cfm
index aee6857..4f264a0 100644
--- a/specification_item_version.cfm
+++ b/specification_item_version.cfm
@@ -64,7 +64,7 @@
usePRG="No"
pageInfo=#pageInfo#
id=""
- queryString="#request.thisPage#?specification_item_uid=#d.specification_item_uid#&agreement_version=#d.agreement_version#"
+ queryString="specification_item_uid=#d.specification_item_uid#&agreement_version=#d.agreement_version#"
defaultBackUrl="specification_item.cfm?specification_item_uid=#d.specification_item_uid#"
status=#pageInfo.status#
trackOut="tr"
@@ -170,7 +170,7 @@
-
+ ВАЖНО! Если нового соглашения нет, его нужно сначала создать (само не создается)