Skip to content

Commit 9adcb7c

Browse files
syypoosyypoo
committed
Fixed qs
1 parent 3d33b23 commit 9adcb7c

File tree

13 files changed

+58
-53
lines changed

13 files changed

+58
-53
lines changed

‎quick-start-apps/application_form_demo.json‎

Lines changed: 3 additions & 3 deletions
Large diffs are not rendered by default.

‎quick-start-apps/application_form_demo/pages/DemoCompaniesList.ptl‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,25 @@ Div(breadcrumb){
33
Div(Class: text-muted, Body: "The app allows to apply for a new business registration and displays the process of request approval by different departments.")
44
}
55
Div(Class: content-wrapper){
6-
Div(Class: col-md-12 panel panel-primary data-sweet-alert){
7-
Form(){
8-
Div(panel-heading, Div(Class:panel-title, Registered companies))
9-
Div(Class: list-group-item){
10-
Div(Class: table-responsive){
11-
DBFind(Name:pc_demo_companies,Source: src_prop).Custom(Reg_date){
12-
DateTime(#date_register#,DD.MM.YYYY HH:MI)
13-
}.Custom(bus_scope){
14-
DBFind(applications,src_app).Columns("name,id").Where("name='Application form'").Vars(appli)
15-
Span(Body: AppParam(App:#appli_id#,Name: business_scope_demo,Index: #business_scope#))
16-
}.Custom(View){
17-
Button(Class: btn btn-default pull-right, Body: Em(Class:fa icon-eye), Page:ViewCompany, PageParams: "company_id=#id#")
18-
}.Custom(found){
19-
Span(Body: Address(#company_founder#))
20-
}.Where("status = 5 or status = 6")
21-
Table(Source: src_prop,Columns:"ID=id,Company name = company_name, Company founder = found,Type = bus_scope,Registration Date=Reg_date,=View")
22-
}
6+
DBFind(Name:pc_demo_companies,Source: src_prop).Custom(Reg_date){
7+
DateTime(#date_register#,DD.MM.YYYY HH:MI)
8+
}.Custom(bus_scope){
9+
DBFind(applications,src_app).Columns("name,id").Where("name='Application form'").Vars(appli)
10+
Span(Body: AppParam(App:#appli_id#,Name: business_scope_demo,Index: #business_scope#))
11+
}.Custom(View){
12+
Button(Class: btn btn-default pull-right, Body: Em(Class:fa icon-eye), Page:ViewCompany, PageParams: "company_id=#id#")
13+
}.Custom(found){
14+
Span(Body: Address(#company_founder#))
15+
}.Custom(custom_id){
16+
Span(Body: #id#)
17+
}.Custom(custom_name){
18+
Span(Body: #company_name#)
19+
}.Where("status = 5 or status = 6")
20+
Form(panel panel-primary){
21+
Div(panel-body){
22+
Div(table-responsive){
23+
Table(Source: src_prop,Columns:"ID=custom_id,Company name=custom_name,Company founder=found,Type=bus_scope,Registration Date=Reg_date,=View")
2324
}
24-
Div(Class: list-group)
2525
}
2626
}
2727
}

‎quick-start-apps/application_form_demo/pages/DemoCreateCompany.ptl‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -361,15 +361,14 @@ Div(Class: content-wrapper){
361361
Div(Class: col-md-3 mt-sm text-right){
362362
Label("Shareholder ID")
363363
}
364-
Div(Class: col-md-5 mt-sm){
364+
Div(Class: col-md-5){
365365
SetVar(create_fn,Address(#create_company_founder#))
366366
Input(Name:founder_key,Disabled:"true",Value:#create_fn#)
367367
}
368-
Div(Class: col-md-2 mt-sm){
368+
Div(Class: col-md-2){
369369
Input(Name:founderProcent, Type: text, Placeholder: %)
370370
}
371371
Div(col-md-1 mt-sm text-left){
372-
373372
}
374373
If(GetVar(cs)==""){
375374
SetVar(cs, Calculate( Exp: 0, Type: int))
@@ -410,7 +409,7 @@ Div(Class: content-wrapper){
410409
Div(Class: col-md-3 mt-sm text-right){
411410
Label("Company Name")
412411
}
413-
Div(Class: col-md-9 mt-sm text-center){
412+
Div(Class: col-md-9){
414413
Input(Name:company_name,Type:text,Class:form-control,Value:#create_company_name#)
415414
}
416415
}
@@ -420,16 +419,16 @@ Div(Class: content-wrapper){
420419
Div(Class: col-md-3 mt-sm text-right){
421420
Label("Business Scope")
422421
}
423-
Div(Class: col-md-9 mt-sm text-center){
422+
Div(Class: col-md-9){
424423
AppParam(App:#appli_id#,Name: business_scope_demo,Source: src_scope)
425424
Select(Name:business_scope,Source:src_scope,NameColumn:"name", ValueColumn: "id",Value:#create_business_scope#)
426425
}
427426
}
428-
Div(Class: row){
427+
Div(Class: row mt-sm){
429428
Div(Class: col-md-3 mt-sm text-right){
430429
Label("Business premises")
431430
}
432-
Div(Class: col-md-9 mt-sm){
431+
Div(Class: col-md-9){
433432
DBFind(Name: pc_property_demo, Source: src_property).Where("del=0")
434433
Select(Name:business_premises,Source:src_property,NameColumn:"name",ValueColumn:"id",Value:#create_business_premises#)
435434
P(Class:text-muted h6 m0, Body: `Before filling the form, create several real estate entries. You can do it via "Property" menu item.`)
@@ -455,7 +454,7 @@ Div(Class: content-wrapper){
455454
Div(Class: col-md-3 mt-sm text-right){
456455
Label("Company Name")
457456
}
458-
Div(Class: col-md-9 mt-sm text-center){
457+
Div(Class: col-md-9){
459458
Input(Name:company_name,Type:text,Class:form-control)
460459
}
461460
}
@@ -465,16 +464,16 @@ Div(Class: content-wrapper){
465464
Div(Class: col-md-3 mt-sm text-right){
466465
Label("Business Scope")
467466
}
468-
Div(Class: col-md-9 mt-sm text-center){
467+
Div(Class: col-md-9){
469468
AppParam(App:#appli_id#,Name: business_scope_demo,Source: src_scope)
470469
Select(Name:business_scope,Source:src_scope,NameColumn:"name", ValueColumn: "id")
471470
}
472471
}
473-
Div(Class: row){
472+
Div(Class: row mt-sm){
474473
Div(Class: col-md-3 mt-sm text-right){
475474
Label("Business premises")
476475
}
477-
Div(Class: col-md-9 mt-sm){
476+
Div(Class: col-md-9){
478477
DBFind(Name: pc_property_demo, Source: src_property).Where("del=0")
479478
Select(Name:business_premises,Source:src_property,NameColumn:"name",ValueColumn:"id")
480479
P(Class:text-muted h6 m0, Body: `Before filling the form, create several real estate entries. You can do it via "Property" menu item.`)

‎quick-start-apps/application_form_demo/pages/demo_property_list.ptl‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,22 @@ SetTitle("Property")
22
Div(breadcrumb){
33
Div(Class: text-muted, Body: "The app allows to apply for a new business registration and displays the process of request approval by different departments.")
44
}
5+
AddToolButton(Add property, fa fa-plus-circle, addProperty, PageParams)
56
Div(Class: content-wrapper){
6-
AddToolButton(Add property, fa fa-plus-circle, addProperty, PageParams)
77
DBFind(Name:pc_property_demo,Source: src_prop).Custom(typ){
88
DBFind(applications,src_app).Columns("name,id").Where("name='Application form'").Vars(appli)
99
Span(Body: AppParam(App:#appli_id#,Name: property_type,Index: #type#))
10+
}.Custom(custom_id){
11+
Span(Class: h5 , Body: #id#)
12+
}.Custom(custom_name){
13+
Span(Class: h5 , Body: #name#)
1014
}.Custom(Maps){
1115
Map(Value: `#coords#`, MapType: "satellite", Hmap: 80)
1216
}.Custom(custom_username){
1317
DBFind(members, src_members).Vars("mem").WhereId(#member_id#)
1418
Span(Class: h5 text-bold, Body: #mem_member_name#)
1519
}.Custom(owners_id){
16-
Span(Class: h5 , Body: #member_id#)
20+
Span(Class: h5 , Body: Address(#member_id#))
1721
}.Custom(custom_edit){
1822
Div(Class: pull-right){
1923
Span(){
@@ -32,7 +36,11 @@ Div(Class: content-wrapper){
3236
}
3337
}
3438
}.Where(del=0)
35-
Div(Class:col-md-12 panel panel-primary data-sweet-alert){
36-
Table(Source: src_prop,Columns:"ID=id,Location on the map=Maps,Address=name,Owner Name=custom_username,Owner ID= owners_id,Type=typ,Police=policeinsp,=custom_edit")
39+
Form(panel panel-primary){
40+
Div(panel-body){
41+
Div(table-responsive){
42+
Table(Source: src_prop,Columns:"ID=custom_id,Location on the map=Maps,Address=custom_name,Owner Name=custom_username,Owner ID=owners_id,Type=typ,Police=policeinsp,=custom_edit")
43+
}
44+
}
3745
}
3846
}

‎quick-start-apps/application_form_demo/struct.dot‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
digraph G {
22
fontsize="24";
3-
label="application_form_demo\nSaturday, 15-Sep-18 00:37:05 +10";
3+
label="application_form_demo\nSaturday, 15-Sep-18 01:15:53 +10";
44
nojustify=true;
55
ordering=out;
66
rankdir=LR;

0 commit comments

Comments
 (0)