diff --git a/src/CurScreen.java b/src/CurScreen.java index 71a9f16..783832e 100644 --- a/src/CurScreen.java +++ b/src/CurScreen.java @@ -36,7 +36,7 @@ public void updateFromState3(String scId, String wid, int state) { String temp_if4; if ((state==0)) { - temp_if4 = "検索画面"; + temp_if4 = "検索項目画面"; } else { temp_if4 = this.value; } diff --git a/src/Main.java b/src/Main.java index 1cb2994..04408d0 100644 --- a/src/Main.java +++ b/src/Main.java @@ -34,8 +34,10 @@ private Search1 search1; private Search2 search2; private Search3 search3; + private Search4 search4; private Search5 search5; private Search6 search6; + private Search7 search7; private Result result; private CompanyList companyList; private SearchCriteriaScreen searchCriteriaScreen; @@ -81,8 +83,10 @@ this.search1 = new Search1(screen); this.search2 = new Search2(screen); this.search3 = new Search3(screen); + this.search4 = new Search4(screen); this.search5 = new Search5(screen); this.search6 = new Search6(screen); + this.search7 = new Search7(screen); this.result = new Result(screen, screenTemplates); this.companyList = new CompanyList(screenTemplates); this.searchCriteriaScreen = new SearchCriteriaScreen(screen, screenTemplates); @@ -90,7 +94,7 @@ this.w2d109ad3739d4744a1874ac179fc38b9 = new W2d109ad3739d4744a1874ac179fc38b9(screenTemplates); this.w4ca84254d30c423ab8e449171a5b5123 = new W4ca84254d30c423ab8e449171a5b5123(screenTemplates); this.businessCardManagement = new BusinessCardManagement(screen, screenTemplates, w4ca84254d30c423ab8e449171a5b5123, searchScreen, searchCriteriaScreen, result, companyList, w2d109ad3739d4744a1874ac179fc38b9); - this.screenTemplates.setReferences(screen, curScreen, presenter, businessCardManagement, company, representative, position, establishment, address1, address2, businessdescription1, businessdescription2, companyoverview, URL, contactPerson1, position1, tel1, email1, contactPerson2, position2, tel2, email2, contactPerson3, position3, tel3, email3, contactPerson4, position4, tel4, email4, searchCriteriaScreen, search1, search2, search3, search5, search6, result, w2d109ad3739d4744a1874ac179fc38b9, w4ca84254d30c423ab8e449171a5b5123); + this.screenTemplates.setReferences(screen, curScreen, presenter, businessCardManagement, company, representative, position, establishment, address1, address2, businessdescription1, businessdescription2, companyoverview, URL, contactPerson1, position1, tel1, email1, contactPerson2, position2, tel2, email2, contactPerson3, position3, tel3, email3, contactPerson4, position4, tel4, email4, searchCriteriaScreen, search1, search2, search3, search4, search5, search6, search7, result, w2d109ad3739d4744a1874ac179fc38b9, w4ca84254d30c423ab8e449171a5b5123); changeCurScreen("企業一覧"); } public Map getScreenTemplates() { @@ -165,12 +169,18 @@ public String getSearch3() { return this.search3.getValue(); } - public String getSearch6() { - return this.search6.getValue(); + public String getSearch4() { + return this.search4.getValue(); } public String getSearch5() { return this.search5.getValue(); } + public String getSearch6() { + return this.search6.getValue(); + } + public String getSearch7() { + return this.search7.getValue(); + } public String getResult() { return this.result.getValue(); } diff --git a/src/ScreenTemplate.java b/src/ScreenTemplate.java index 1470069..6903e0c 100644 --- a/src/ScreenTemplate.java +++ b/src/ScreenTemplate.java @@ -31,9 +31,9 @@ public ScreenTemplate() { this.widgets = new Widgets1(); } - public void setReferences(Screen screen, CurScreen curScreen, SwingPresenter presenter, BusinessCardManagement businessCardManagement, Company company, Representative representative, Position position, Establishment establishment, Address1 address1, Address2 address2, Businessdescription1 businessdescription1, Businessdescription2 businessdescription2, Companyoverview companyoverview, URL URL, ContactPerson1 contactPerson1, Position1 position1, Tel1 tel1, Email1 email1, ContactPerson2 contactPerson2, Position2 position2, Tel2 tel2, Email2 email2, ContactPerson3 contactPerson3, Position3 position3, Tel3 tel3, Email3 email3, ContactPerson4 contactPerson4, Position4 position4, Tel4 tel4, Email4 email4, SearchCriteriaScreen searchCriteriaScreen, Search1 search1, Search2 search2, Search3 search3, Search5 search5, Search6 search6, Result result, W2d109ad3739d4744a1874ac179fc38b9 w2d109ad3739d4744a1874ac179fc38b9, W4ca84254d30c423ab8e449171a5b5123 w4ca84254d30c423ab8e449171a5b5123) { + public void setReferences(Screen screen, CurScreen curScreen, SwingPresenter presenter, BusinessCardManagement businessCardManagement, Company company, Representative representative, Position position, Establishment establishment, Address1 address1, Address2 address2, Businessdescription1 businessdescription1, Businessdescription2 businessdescription2, Companyoverview companyoverview, URL URL, ContactPerson1 contactPerson1, Position1 position1, Tel1 tel1, Email1 email1, ContactPerson2 contactPerson2, Position2 position2, Tel2 tel2, Email2 email2, ContactPerson3 contactPerson3, Position3 position3, Tel3 tel3, Email3 email3, ContactPerson4 contactPerson4, Position4 position4, Tel4 tel4, Email4 email4, SearchCriteriaScreen searchCriteriaScreen, Search1 search1, Search2 search2, Search3 search3, Search4 search4, Search5 search5, Search6 search6, Search7 search7, Result result, W2d109ad3739d4744a1874ac179fc38b9 w2d109ad3739d4744a1874ac179fc38b9, W4ca84254d30c423ab8e449171a5b5123 w4ca84254d30c423ab8e449171a5b5123) { this.curScreen = curScreen; this.presenter = presenter; - this.widgets.setReferences(screen, curScreen, presenter, businessCardManagement, company, representative, position, establishment, address1, address2, businessdescription1, businessdescription2, companyoverview, URL, contactPerson1, position1, tel1, email1, contactPerson2, position2, tel2, email2, contactPerson3, position3, tel3, email3, contactPerson4, position4, tel4, email4, searchCriteriaScreen, search1, search2, search3, search5, search6, result, w2d109ad3739d4744a1874ac179fc38b9, w4ca84254d30c423ab8e449171a5b5123); + this.widgets.setReferences(screen, curScreen, presenter, businessCardManagement, company, representative, position, establishment, address1, address2, businessdescription1, businessdescription2, companyoverview, URL, contactPerson1, position1, tel1, email1, contactPerson2, position2, tel2, email2, contactPerson3, position3, tel3, email3, contactPerson4, position4, tel4, email4, searchCriteriaScreen, search1, search2, search3, search4, search5, search6, search7, result, w2d109ad3739d4744a1874ac179fc38b9, w4ca84254d30c423ab8e449171a5b5123); } } \ No newline at end of file diff --git a/src/ScreenTemplates.java b/src/ScreenTemplates.java index b91aece..c4fde8d 100644 --- a/src/ScreenTemplates.java +++ b/src/ScreenTemplates.java @@ -1500,11 +1500,11 @@ public Map getValue() { return new HashMap<>(this.value); } - public void setReferences(Screen screen, CurScreen curScreen, SwingPresenter presenter, BusinessCardManagement businessCardManagement, Company company, Representative representative, Position position, Establishment establishment, Address1 address1, Address2 address2, Businessdescription1 businessdescription1, Businessdescription2 businessdescription2, Companyoverview companyoverview, URL URL, ContactPerson1 contactPerson1, Position1 position1, Tel1 tel1, Email1 email1, ContactPerson2 contactPerson2, Position2 position2, Tel2 tel2, Email2 email2, ContactPerson3 contactPerson3, Position3 position3, Tel3 tel3, Email3 email3, ContactPerson4 contactPerson4, Position4 position4, Tel4 tel4, Email4 email4, SearchCriteriaScreen searchCriteriaScreen, Search1 search1, Search2 search2, Search3 search3, Search5 search5, Search6 search6, Result result, W2d109ad3739d4744a1874ac179fc38b9 w2d109ad3739d4744a1874ac179fc38b9, W4ca84254d30c423ab8e449171a5b5123 w4ca84254d30c423ab8e449171a5b5123) { + public void setReferences(Screen screen, CurScreen curScreen, SwingPresenter presenter, BusinessCardManagement businessCardManagement, Company company, Representative representative, Position position, Establishment establishment, Address1 address1, Address2 address2, Businessdescription1 businessdescription1, Businessdescription2 businessdescription2, Companyoverview companyoverview, URL URL, ContactPerson1 contactPerson1, Position1 position1, Tel1 tel1, Email1 email1, ContactPerson2 contactPerson2, Position2 position2, Tel2 tel2, Email2 email2, ContactPerson3 contactPerson3, Position3 position3, Tel3 tel3, Email3 email3, ContactPerson4 contactPerson4, Position4 position4, Tel4 tel4, Email4 email4, SearchCriteriaScreen searchCriteriaScreen, Search1 search1, Search2 search2, Search3 search3, Search4 search4, Search5 search5, Search6 search6, Search7 search7, Result result, W2d109ad3739d4744a1874ac179fc38b9 w2d109ad3739d4744a1874ac179fc38b9, W4ca84254d30c423ab8e449171a5b5123 w4ca84254d30c423ab8e449171a5b5123) { this.presenter = presenter; this.curScreen = curScreen; for (ScreenTemplate screenTemplate: value.values()) { - screenTemplate.setReferences(screen, curScreen, presenter, businessCardManagement, company, representative, position, establishment, address1, address2, businessdescription1, businessdescription2, companyoverview, URL, contactPerson1, position1, tel1, email1, contactPerson2, position2, tel2, email2, contactPerson3, position3, tel3, email3, contactPerson4, position4, tel4, email4, searchCriteriaScreen, search1, search2, search3, search5, search6, result, w2d109ad3739d4744a1874ac179fc38b9, w4ca84254d30c423ab8e449171a5b5123); + screenTemplate.setReferences(screen, curScreen, presenter, businessCardManagement, company, representative, position, establishment, address1, address2, businessdescription1, businessdescription2, companyoverview, URL, contactPerson1, position1, tel1, email1, contactPerson2, position2, tel2, email2, contactPerson3, position3, tel3, email3, contactPerson4, position4, tel4, email4, searchCriteriaScreen, search1, search2, search3, search4, search5, search6, search7, result, w2d109ad3739d4744a1874ac179fc38b9, w4ca84254d30c423ab8e449171a5b5123); } } public ScreenTemplate getScreenTemplate(String scId) { diff --git a/src/Search4.java b/src/Search4.java new file mode 100644 index 0000000..057f38d --- /dev/null +++ b/src/Search4.java @@ -0,0 +1,10 @@ +public class Search4 { + private Screen screen; + private String value = "search4"; + public Search4(Screen screen) { + this.screen = screen; + } + public String getValue() { + return new String(this.value); + } +} \ No newline at end of file diff --git a/src/Search7.java b/src/Search7.java new file mode 100644 index 0000000..9079720 --- /dev/null +++ b/src/Search7.java @@ -0,0 +1,10 @@ +public class Search7 { + private Screen screen; + private String value = "search7"; + public Search7(Screen screen) { + this.screen = screen; + } + public String getValue() { + return new String(this.value); + } +} \ No newline at end of file diff --git a/src/Widget.java b/src/Widget.java index db33813..e753011 100644 --- a/src/Widget.java +++ b/src/Widget.java @@ -99,7 +99,7 @@ // public void updateFromWidget(String self, String scId, String wid, Map widget, String curScreen) { // this.value = widget; // } - public void updateDataFromState(String screenId, String widId, int state, String search1, String search2, String search3, String search5, String search6, String result, String address1_, String address2_, String businessdescription1_, String businessdescription2_, String companyoverview_, Map> businessCardManagement) { + public void updateDataFromState(String screenId, String widId, int state, String search1, String search2, String search3, String search4, String search5, String search6, String search7, String result, Map> businessCardManagement) { Map> temp_if0; if ((state==0)) { Map temp_json92 = new HashMap<>(); @@ -108,9 +108,13 @@ temp_json92.put("事業内容１", search1); temp_json92.put("事業内容２", search2); temp_json92.put("会社概要", search3); + temp_json92.put("担当者", search7); Map> temp_search0 = new HashMap<>(); for (String key: businessCardManagement.keySet()) { boolean isMatch = true; + if (search4 != null && !search4.isEmpty()) { // 会社名を指定 + if (!key.contains(search4)) continue; + } for (String qKey: temp_json92.keySet()) { Map value = businessCardManagement.get(key); for (String valKey: value.keySet()) { diff --git a/src/Widget1.java b/src/Widget1.java index e134881..cb4f3f5 100644 --- a/src/Widget1.java +++ b/src/Widget1.java @@ -47,13 +47,15 @@ private Search1 search1; private Search2 search2; private Search3 search3; + private Search4 search4; private Search5 search5; private Search6 search6; + private Search7 search7; private Result result; private W2d109ad3739d4744a1874ac179fc38b9 w2d109ad3739d4744a1874ac179fc38b9; private W4ca84254d30c423ab8e449171a5b5123 w4ca84254d30c423ab8e449171a5b5123; - public Widget1(String type, String text, boolean visible, int x, int y, int width, int height, int state, Map> data, List columns, String primaryKeyName, SwingPresenter presenter) { + public Widget1(String type, String text, boolean visible, int x, int y, int width, int height, int state, Map> data, List columns, String primaryKeyName, SwingPresenter presenter) { this.type = type; this.text = text; this.visible = visible; @@ -604,11 +606,11 @@ String search1 = this.search1.getValue(); String search2 = this.search2.getValue(); String search3 = this.search3.getValue(); + String search4 = this.search4.getValue(); String search5 = this.search5.getValue(); String search6 = this.search6.getValue(); + String search7 = this.search7.getValue(); String result = this.result.getValue(); - String address1 = this.address1.getValue(); - String address2 = this.address2.getValue(); String businessdescription1 = this.businessdescription1.getValue(); String businessdescription2 = this.businessdescription2.getValue(); String companyoverview = this.companyoverview.getValue(); @@ -618,27 +620,21 @@ String search2_ = this.widget1.getText(); this.widget1 = screen.getWidgets().getWidget(search3); String search3_ = this.widget1.getText(); + this.widget1 = screen.getWidgets().getWidget(search4); + String search4_ = this.widget1.getText(); this.widget1 = screen.getWidgets().getWidget(search5); String search5_ = this.widget1.getText(); this.widget1 = screen.getWidgets().getWidget(search6); String search6_ = this.widget1.getText(); - this.widget1 = screen.getWidgets().getWidget(address1); - String address1_ = this.widget1.getText(); - this.widget1 = screen.getWidgets().getWidget(address2); - String address2_ = this.widget1.getText(); - this.widget1 = screen.getWidgets().getWidget(businessdescription1); - String businessdescription1_ = this.widget1.getText(); - this.widget1 = screen.getWidgets().getWidget(businessdescription2); - String businessdescription2_ = this.widget1.getText(); - this.widget1 = screen.getWidgets().getWidget(companyoverview); - String companyoverview_ = this.widget1.getText(); + this.widget1 = screen.getWidgets().getWidget(search7); + String search7_ = this.widget1.getText(); this.widget1 = screen.getWidgets().getWidget(result); String result_ = this.widget1.getText(); Map> businessCardManagement = this.businessCardManagement.getValue(); - this.widget1.updateDataFromState(curScreen, result, this.state, search1_, search2_, search3_, search5_, search6_, result_, address1_, address2_, businessdescription1_, businessdescription2_, companyoverview_, businessCardManagement); + this.widget1.updateDataFromState(curScreen, result, this.state, search1_, search2_, search3_, search4_, search5_, search6_, search7_, result_, businessCardManagement); } } - public void setReferences(Screen screen, CurScreen curScreen, SwingPresenter presenter, BusinessCardManagement businessCardManagement, Company company, Representative representative, Position position, Establishment establishment, Address1 address1, Address2 address2, Businessdescription1 businessdescription1, Businessdescription2 businessdescription2, Companyoverview companyoverview, URL URL, ContactPerson1 contactPerson1, Position1 position1, Tel1 tel1, Email1 email1, ContactPerson2 contactPerson2, Position2 position2, Tel2 tel2, Email2 email2, ContactPerson3 contactPerson3, Position3 position3, Tel3 tel3, Email3 email3, ContactPerson4 contactPerson4, Position4 position4, Tel4 tel4, Email4 email4, SearchCriteriaScreen searchCriteriaScreen, Search1 search1, Search2 search2, Search3 search3, Search5 search5, Search6 search6, Result result, W2d109ad3739d4744a1874ac179fc38b9 w2d109ad3739d4744a1874ac179fc38b9, W4ca84254d30c423ab8e449171a5b5123 w4ca84254d30c423ab8e449171a5b5123) { + public void setReferences(Screen screen, CurScreen curScreen, SwingPresenter presenter, BusinessCardManagement businessCardManagement, Company company, Representative representative, Position position, Establishment establishment, Address1 address1, Address2 address2, Businessdescription1 businessdescription1, Businessdescription2 businessdescription2, Companyoverview companyoverview, URL URL, ContactPerson1 contactPerson1, Position1 position1, Tel1 tel1, Email1 email1, ContactPerson2 contactPerson2, Position2 position2, Tel2 tel2, Email2 email2, ContactPerson3 contactPerson3, Position3 position3, Tel3 tel3, Email3 email3, ContactPerson4 contactPerson4, Position4 position4, Tel4 tel4, Email4 email4, SearchCriteriaScreen searchCriteriaScreen, Search1 search1, Search2 search2, Search3 search3, Search4 search4, Search5 search5, Search6 search6, Search7 search7, Result result, W2d109ad3739d4744a1874ac179fc38b9 w2d109ad3739d4744a1874ac179fc38b9, W4ca84254d30c423ab8e449171a5b5123 w4ca84254d30c423ab8e449171a5b5123) { this.screen = screen; this.curScreen = curScreen; this.presenter = presenter; @@ -673,8 +669,10 @@ this.search1 = search1; this.search2 = search2; this.search3 = search3; + this.search4 = search4; this.search5 = search5; this.search6 = search6; + this.search7 = search7; this.result = result; this.w2d109ad3739d4744a1874ac179fc38b9 = w2d109ad3739d4744a1874ac179fc38b9; this.w4ca84254d30c423ab8e449171a5b5123 = w4ca84254d30c423ab8e449171a5b5123; diff --git a/src/Widgets1.java b/src/Widgets1.java index 4f72d35..a4f48ef 100644 --- a/src/Widgets1.java +++ b/src/Widgets1.java @@ -42,11 +42,11 @@ public Widget1 getWidget1(String wid) { return this.value.get(wid); } - public void setReferences(Screen screen, CurScreen curScreen, SwingPresenter presenter, BusinessCardManagement businessCardManagement, Company company, Representative representative, Position position, Establishment establishment, Address1 address1, Address2 address2, Businessdescription1 businessdescription1, Businessdescription2 businessdescription2, Companyoverview companyoverview, URL URL, ContactPerson1 contactPerson1, Position1 position1, Tel1 tel1, Email1 email1, ContactPerson2 contactPerson2, Position2 position2, Tel2 tel2, Email2 email2, ContactPerson3 contactPerson3, Position3 position3, Tel3 tel3, Email3 email3, ContactPerson4 contactPerson4, Position4 position4, Tel4 tel4, Email4 email4, SearchCriteriaScreen searchCriteriaScreen, Search1 search1, Search2 search, Search3 search3, Search5 search5, Search6 search6, Result result, W2d109ad3739d4744a1874ac179fc38b9 w2d109ad3739d4744a1874ac179fc38b9, W4ca84254d30c423ab8e449171a5b5123 w4ca84254d30c423ab8e449171a5b5123) { + public void setReferences(Screen screen, CurScreen curScreen, SwingPresenter presenter, BusinessCardManagement businessCardManagement, Company company, Representative representative, Position position, Establishment establishment, Address1 address1, Address2 address2, Businessdescription1 businessdescription1, Businessdescription2 businessdescription2, Companyoverview companyoverview, URL URL, ContactPerson1 contactPerson1, Position1 position1, Tel1 tel1, Email1 email1, ContactPerson2 contactPerson2, Position2 position2, Tel2 tel2, Email2 email2, ContactPerson3 contactPerson3, Position3 position3, Tel3 tel3, Email3 email3, ContactPerson4 contactPerson4, Position4 position4, Tel4 tel4, Email4 email4, SearchCriteriaScreen searchCriteriaScreen, Search1 search1, Search2 search, Search3 search3, Search4 search4, Search5 search5, Search6 search6, Search7 search7, Result result, W2d109ad3739d4744a1874ac179fc38b9 w2d109ad3739d4744a1874ac179fc38b9, W4ca84254d30c423ab8e449171a5b5123 w4ca84254d30c423ab8e449171a5b5123) { this.curScreen = curScreen; this.presenter = presenter; for (Widget1 widget: value.values()) { - widget.setReferences(screen, curScreen, presenter, businessCardManagement, company, representative, position, establishment, address1, address2, businessdescription1, businessdescription2, companyoverview, URL, contactPerson1, position1, tel1, email1, contactPerson2, position2, tel2, email2, contactPerson3, position3, tel3, email3, contactPerson4, position4, tel4, email4, searchCriteriaScreen, search1, search, search3, search5, search6, result, w2d109ad3739d4744a1874ac179fc38b9, w4ca84254d30c423ab8e449171a5b5123); + widget.setReferences(screen, curScreen, presenter, businessCardManagement, company, representative, position, establishment, address1, address2, businessdescription1, businessdescription2, companyoverview, URL, contactPerson1, position1, tel1, email1, contactPerson2, position2, tel2, email2, contactPerson3, position3, tel3, email3, contactPerson4, position4, tel4, email4, searchCriteriaScreen, search1, search, search3, search4, search5, search6, search7, result, w2d109ad3739d4744a1874ac179fc38b9, w4ca84254d30c423ab8e449171a5b5123); } } } \ No newline at end of file