LOGIN
- Enterprizing Systems Prompt.
+ ERP.UNO Systems Prompt.
diff --git a/src/boot/bank_kvs.erl b/src/boot/fin_kvs.erl
similarity index 83%
rename from src/boot/bank_kvs.erl
rename to src/boot/fin_kvs.erl
index 35bd0a3..a9b93c0 100644
--- a/src/boot/bank_kvs.erl
+++ b/src/boot/fin_kvs.erl
@@ -1,14 +1,13 @@
--module(bank_kvs).
--compile(export_all).
+-module(fin_kvs).
+-export([metainfo/0,fin/0]).
-include("bank/phone.hrl").
-include("ent.hrl").
-include_lib("kvs/include/metainfo.hrl").
-include_lib("form/include/meta.hrl").
-metainfo() -> #schema { name = kvx,
- tables = lists:flatten([ bank()]) }.
+metainfo() -> #schema { name = fin, tables = fin() }.
-bank() ->
+fin() ->
[
#table{name = phone, fields=record_info(fields, phone), instance = #phone{} },
#table{name = field, fields=record_info(fields, field), instance = #field{} },
diff --git a/src/fin.app.src b/src/fin.app.src
index 45eb4ae..f0aaced 100644
--- a/src/fin.app.src
+++ b/src/fin.app.src
@@ -1,7 +1,7 @@
{application, fin,
[
{description, "FIN Account Management"},
- {vsn, "3.11.1"},
+ {vsn, "3.11.2"},
{registered, []},
{applications, [public_key,asn1,kernel,stdlib,rocksdb,mnesia,ranch,cowboy,
nitro,syntax_tools,compiler,xmerl,kvs,syn,n2o,bpe,form]},
diff --git a/src/fin.erl b/src/fin.erl
index 807914d..3c9163e 100644
--- a/src/fin.erl
+++ b/src/fin.erl
@@ -1,5 +1,4 @@
-module(fin).
--compile(export_all).
-behaviour(application).
-behaviour(supervisor).
-export([start/2, stop/1, init/1]).
diff --git a/src/forms/bpe_create.erl b/src/forms/bpe_create.erl
new file mode 100644
index 0000000..891ef8d
--- /dev/null
+++ b/src/forms/bpe_create.erl
@@ -0,0 +1,31 @@
+-module(bpe_create).
+-copyright('Maxim Sokhatsky').
+-include_lib("nitro/include/nitro.hrl").
+-include_lib("form/include/meta.hrl").
+-include_lib("bpe/include/bpe.hrl").
+-include("act.hrl").
+-export([doc/0,id/0,new/3]).
+
+doc() -> "Dialog for creation of BPE processes.".
+id() -> #act{}.
+new(Name,#act{}, _) ->
+ put(process_type_pi_none, "bpe_account"),
+ #document { name = form:atom([pi,Name]),
+ sections = [ #sec { name=[<<"New process: "/utf8>>] } ],
+ buttons = [ #but { id=form:atom([pi,decline]),
+ title= <<"Discard"/utf8>>,
+ class=cancel,
+ postback={'Discard',[]} },
+ #but { id=form:atom([pi,proceed]),
+ title = <<"Create"/utf8>>,
+ class = [button,sgreen],
+ sources = [process_type],
+ postback = {'Spawn',[]}}],
+ fields = [ #field { name=process_type,
+ id=process_type,
+ type=select,
+ title= "Type",
+ tooltips = [],
+ default = bpe_account,
+ options = [ #opt{name=bpe_account,checked=true,title = "Client Account"} ]
+ } ] }.
diff --git a/src/forms/bpe_pass.erl b/src/forms/bpe_pass.erl
index 72cb6d8..7fe7f10 100644
--- a/src/forms/bpe_pass.erl
+++ b/src/forms/bpe_pass.erl
@@ -2,7 +2,7 @@
-copyright('Maxim Sokhatsky').
-include_lib("form/include/meta.hrl").
-include("bank/phone.hrl").
--compile(export_all).
+-export([doc/0,id/0,new/3]).
doc() -> "One-time password PIN control used in banks,".
id() -> #phone{}.
diff --git a/src/forms/bpe_route.erl b/src/forms/bpe_route.erl
deleted file mode 100644
index f68dd66..0000000
--- a/src/forms/bpe_route.erl
+++ /dev/null
@@ -1,24 +0,0 @@
--module(bpe_route).
--include_lib("n2o/include/n2o.hrl").
--export([init/2, finish/2]).
-
-finish(State, Ctx) -> {ok, State, Ctx}.
-init(State, #cx{req=Req}=Cx) ->
- #{path:=Path}=Req,
- Fix = route_prefix(Path),
- {ok, State, Cx#cx{path=Path,module=Fix}}.
-
-route_prefix(<<"/ws/",P/binary>>) -> route(P);
-route_prefix(<<"/",P/binary>>) -> route(P);
-route_prefix(P) -> route(P).
-
-route(<<>>) -> bpe_index;
-route(<<"actors",_/binary>>) -> bpe_index;
-route(<<"login",_/binary>>) -> bpe_login;
-route(<<"forms",_/binary>>) -> bpe_forms;
-route(<<"act",_/binary>>) -> bpe_act;
-route(<<"app/actors",_/binary>>) -> bpe_index;
-route(<<"app/login",_/binary>>) -> bpe_login;
-route(<<"app/forms",_/binary>>) -> bpe_forms;
-route(<<"app/act",_/binary>>) -> bpe_act;
-route(_) -> bpe_login.
diff --git a/src/forms/bpe_row.erl b/src/forms/bpe_row.erl
index 3306f5e..6af9498 100644
--- a/src/forms/bpe_row.erl
+++ b/src/forms/bpe_row.erl
@@ -1,6 +1,6 @@
-module(bpe_row).
-copyright('Maxim Sokhatsky').
--compile(export_all).
+-export([doc/0,id/0,new/3]).
-include_lib("bpe/include/bpe.hrl").
-include_lib("nitro/include/nitro.hrl").
@@ -11,9 +11,7 @@ current(Proc) -> {_,T} = bpe:current_task(Proc), T.
new(Name,Proc,_) ->
Pid = nitro:to_list(Proc#process.id),
Docs = Proc#process.docs,
- #panel { id=form:atom([tr,Name]),
- class=td,
- body=[
+ #panel { id=form:atom([tr,Name]), class=td, body=[
#panel{class=column6, body = #link{href="act.htm?p="++Pid, body=Pid } },
#panel{class=column6, body = nitro:to_list(Proc#process.name) },
#panel{class=column6, body = nitro:to_list(current(Proc))},
diff --git a/src/forms/bpe_trace.erl b/src/forms/bpe_trace.erl
index af0e506..3a11342 100644
--- a/src/forms/bpe_trace.erl
+++ b/src/forms/bpe_trace.erl
@@ -1,6 +1,6 @@
-module(bpe_trace).
-copyright('Maxim Sokhatsky').
--compile(export_all).
+-export([doc/0,id/0,new/3]).
-include_lib("bpe/include/bpe.hrl").
-include_lib("nitro/include/nitro.hrl").
diff --git a/src/pages/bpe_act.erl b/src/pages/bpe_act.erl
index 1947469..016dce7 100644
--- a/src/pages/bpe_act.erl
+++ b/src/pages/bpe_act.erl
@@ -4,7 +4,7 @@
-include_lib("form/include/meta.hrl").
-include_lib("bpe/include/bpe.hrl").
-include("act.hrl").
--compile(export_all).
+-export([event/1]).
event(init) ->
nitro:clear(tableHead),
@@ -30,8 +30,7 @@ event(init) ->
|| I <- History ]
end;
-event(E) ->
- io:format("Event:process:~p~n.",[E]),
+event(_) ->
ok.
header() ->
@@ -39,27 +38,3 @@ header() ->
[#panel{class=column6,body="State"},
#panel{class=column6,body="Documents"}]}.
-doc() -> "Dialog for creation of BPE processes.".
-id() -> #act{}.
-new(Name,#act{}, _) ->
- put(process_type_pi_none, "bpe_account"),
- #document { name = form:atom([pi,Name]), sections = [
- #sec { name=[<<"New process: "/utf8>>] } ],
- buttons = [ #but { id=form:atom([pi,decline]),
- title= <<"Discard"/utf8>>,
- class=cancel,
- postback={'Discard',[]} },
- #but { id=form:atom([pi,proceed]),
- title = <<"Create"/utf8>>,
- class = [button,sgreen],
- sources = [process_type],
- postback = {'Spawn',[]}}],
- fields = [ #field { name=process_type,
- id=process_type,
- type=select,
- title= "Type",
- tooltips = [],
- default = bpe_account,
- options = [ #opt{name=bpe_account,checked=true,title = "Client Account [FIN.ERP.UNO]"} ],
- postback = {'TypeSelect'}
- } ] }.
diff --git a/src/pages/bpe_forms.erl b/src/pages/bpe_forms.erl
index 43e07e4..5bba702 100644
--- a/src/pages/bpe_forms.erl
+++ b/src/pages/bpe_forms.erl
@@ -1,6 +1,6 @@
-module(bpe_forms).
-copyright('Maxim Sokhatsky').
--compile(export_all).
+-export([event/1]).
-include_lib("n2o/include/n2o.hrl").
-include_lib("nitro/include/nitro.hrl").
@@ -12,11 +12,10 @@ event({client,{form,Module}}) ->
event(init) ->
nitro:clear(stand),
[ self() ! {client,{form,F}} || F <- application:get_env(form, registry, []) ],
- ?LOG_INFO("HELO.~n",[]);
+ ok;
event({Event,Name}) ->
- nitro:wire(lists:concat(["console.log(\"",io_lib:format("~p",[{Event,Name}]),"\");"])),
- ?LOG_INFO("Event:~p.~n", [{Event,Name}]);
+ nitro:wire(lists:concat(["console.log(\"",io_lib:format("~p",[{Event,Name}]),"\");"]));
+
+event(_Event) -> ok.
-event(Event) ->
- ?LOG_INFO("Unknown:~p.~n", [Event]).
diff --git a/src/pages/bpe_index.erl b/src/pages/bpe_index.erl
index 0a15086..cf76bd0 100644
--- a/src/pages/bpe_index.erl
+++ b/src/pages/bpe_index.erl
@@ -1,6 +1,6 @@
-module(bpe_index).
-copyright('Maxim Sokhatsky').
--compile(export_all).
+-export([event/1]).
-include_lib("n2o/include/n2o.hrl").
-include_lib("bpe/include/bpe.hrl").
-include_lib("nitro/include/nitro.hrl").
@@ -21,7 +21,7 @@ event(init) ->
nitro:insert_top(tableHead, header()),
nitro:clear(frms),
nitro:clear(ctrl),
- Module = bpe_act,
+ Module = bpe_create,
nitro:insert_bottom(frms, form:new(Module:new(Module,Module:id(), []), Module:id(), [])),
nitro:insert_bottom(ctrl, #link{id=creator, body="New",postback=create, class=[button,sgreen]}),
nitro:hide(frms),
@@ -30,10 +30,11 @@ event(init) ->
ok;
event({complete,Id}) ->
- bpe:start(bpe:load(Id),[]),
- io:format("Next: ~p~n",[bpe:next(Id)]),
- nitro:update(form:atom([tr,row,Id]),
- bpe_row:new(form:atom([row,Id]),bpe:load(Id),[]));
+ Proc = bpe:load(Id),
+ bpe:start(Proc,[]),
+ bpe:next(Id),
+ nitro:update(form:atom([tr,row,Id]), bpe_row:new(form:atom([row,Id]),Proc,[])),
+ ok;
event(create) ->
nitro:hide(ctrl),
@@ -46,20 +47,14 @@ event({'Spawn',_}) ->
{ok,I} -> I end,
nitro:insert_after(header, bpe_row:new(form:atom([row,Id]),bpe:proc(Id),[])),
nitro:hide(frms),
- nitro:show(ctrl),
- ?LOG_INFO("BPE: ~p.~n", [Id]);
-
-event({'TypeSelect'}) ->
-% [ io:format("Process Dictionary: ~p : ~p~n",[X,erlang:get(X)]) || X <- erlang:get_keys()],
- io:format("~p",["Type Select"]);
+ nitro:show(ctrl);
event({'Discard',[]}) ->
nitro:hide(frms),
nitro:show(ctrl);
event({Event,Name}) ->
- nitro:wire(lists:concat(["console.log(\"",io_lib:format("~p",[{Event,Name}]),"\");"])),
- ?LOG_INFO("Event:~p.~n", [{Event,Name}]);
+ nitro:wire(lists:concat(["console.log(\"",io_lib:format("~p",[{Event,Name}]),"\");"]));
event(Event) ->
- ?LOG_INFO("Unknown:~p.~n", [Event]).
+ ok.
diff --git a/src/pages/bpe_login.erl b/src/pages/bpe_login.erl
index 7fbc5bb..b2f4da3 100644
--- a/src/pages/bpe_login.erl
+++ b/src/pages/bpe_login.erl
@@ -1,6 +1,6 @@
-module(bpe_login).
-copyright('Maxim Sokhatsky').
--compile(export_all).
+-export([event/1]).
-include_lib("n2o/include/n2o.hrl").
-include_lib("nitro/include/nitro.hrl").
diff --git a/src/pages/bank_route.erl b/src/pages/fin_route.erl
similarity index 97%
rename from src/pages/bank_route.erl
rename to src/pages/fin_route.erl
index db0e31f..132b2b6 100644
--- a/src/pages/bank_route.erl
+++ b/src/pages/fin_route.erl
@@ -1,4 +1,4 @@
--module(bank_route).
+-module(fin_route).
-include_lib("n2o/include/n2o.hrl").
-export([init/2, finish/2]).
diff --git a/src/processes/bank_charge.erl b/src/processes/bank_charge.erl
deleted file mode 100644
index 44a1dd7..0000000
--- a/src/processes/bank_charge.erl
+++ /dev/null
@@ -1,7 +0,0 @@
--module(bank_charge).
--include_lib("bpe/include/bpe.hrl").
--compile(export_all).
-
-def() ->
- #process{}.
-
diff --git a/src/processes/bank_close.erl b/src/processes/bank_close.erl
deleted file mode 100644
index 01bd633..0000000
--- a/src/processes/bank_close.erl
+++ /dev/null
@@ -1,6 +0,0 @@
--module(bank_close).
--include_lib("bpe/include/bpe.hrl").
--compile(export_all).
-
-def() ->
- #process{}.
\ No newline at end of file
diff --git a/src/processes/bank_open.erl b/src/processes/bank_open.erl
deleted file mode 100644
index a8da23b..0000000
--- a/src/processes/bank_open.erl
+++ /dev/null
@@ -1,6 +0,0 @@
--module(bank_open).
--include_lib("bpe/include/bpe.hrl").
--compile(export_all).
-
-def() ->
- #process{}.
\ No newline at end of file
diff --git a/src/processes/bank_tx.erl b/src/processes/bank_tx.erl
deleted file mode 100644
index 897cb0f..0000000
--- a/src/processes/bank_tx.erl
+++ /dev/null
@@ -1,6 +0,0 @@
--module(bank_tx).
--include_lib("bpe/include/bpe.hrl").
--compile(export_all).
-
-def() ->
- #process{}.
\ No newline at end of file
diff --git a/src/processes/bank_withdraw.erl b/src/processes/bank_withdraw.erl
deleted file mode 100644
index 711be15..0000000
--- a/src/processes/bank_withdraw.erl
+++ /dev/null
@@ -1,7 +0,0 @@
--module(bank_withdraw).
--include_lib("bpe/include/bpe.hrl").
--compile(export_all).
-
-def() ->
- #process{}.
-
diff --git a/src/processes/fin_charge.erl b/src/processes/fin_charge.erl
new file mode 100644
index 0000000..3c7a075
--- /dev/null
+++ b/src/processes/fin_charge.erl
@@ -0,0 +1,7 @@
+-module(fin_charge).
+-include_lib("bpe/include/bpe.hrl").
+-export([def/0,action/2]).
+
+def() -> #process{}.
+action(_,_) -> #result{}.
+
diff --git a/src/processes/fin_close.erl b/src/processes/fin_close.erl
new file mode 100644
index 0000000..5d78cf3
--- /dev/null
+++ b/src/processes/fin_close.erl
@@ -0,0 +1,7 @@
+-module(fin_close).
+-include_lib("bpe/include/bpe.hrl").
+-export([def/0,action/2]).
+
+def() -> #process{}.
+action(_,_) -> #result{}.
+
diff --git a/src/processes/fin_open.erl b/src/processes/fin_open.erl
new file mode 100644
index 0000000..3c8ffa3
--- /dev/null
+++ b/src/processes/fin_open.erl
@@ -0,0 +1,7 @@
+-module(fin_open).
+-include_lib("bpe/include/bpe.hrl").
+-export([def/0,action/2]).
+
+def() -> #process{}.
+action(_,_) -> #result{}.
+
+ 