-
Notifications
You must be signed in to change notification settings - Fork 34
Find group #176
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
yajaneya
wants to merge
7
commits into
siblis:develop
Choose a base branch
from
yajaneya:findGroup
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Find group #176
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
78e6e98
Merge pull request #6 from siblis/develop
yajaneya 65820b2
Merge pull request #7 from siblis/develop
yajaneya 8d87aef
Сделана заглушка на поиск группы
yajaneya 3779b54
Обеспечение доступа к конструктору GroupController из ChatViewController
yajaneya c94529d
Доработка по замечаниям.
yajaneya cfc014d
Доработка по замечаниям...
yajaneya b2415e5
обозначил заглушку метода поиска группы
yajaneya File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -109,7 +109,7 @@ public static ServerResponse getUserMessages(String token, String userId, int of | |
| } | ||
|
|
||
| public static ServerResponse getGroupInfo(String id, String token) throws Exception { | ||
| HttpsURLConnection connection = getConnection("/v1/chats/" + id, "GET", token); | ||
| HttpsURLConnection connection = getConnection("/groups/%id=" + id, "GET", token); | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Это к старому бэкенду был. Сейчас переделываем и этот метод надо будет удалить. |
||
| return getServerResponse(connection, null); | ||
| } | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,6 +2,7 @@ | |
|
|
||
| import ru.geekbrains.pocket.messenger.client.Main; | ||
| import ru.geekbrains.pocket.messenger.client.controller.ClientController; | ||
| import ru.geekbrains.pocket.messenger.client.controller.GroupController; | ||
| import ru.geekbrains.pocket.messenger.client.utils.Common; | ||
| import ru.geekbrains.pocket.messenger.client.utils.CustomTextArea; | ||
| import com.jfoenix.controls.*; | ||
|
|
@@ -36,7 +37,10 @@ | |
| import org.w3c.dom.events.EventListener; | ||
| import org.w3c.dom.events.EventTarget; | ||
| import ru.geekbrains.pocket.messenger.client.view.customFX.*; | ||
| import ru.geekbrains.pocket.messenger.client.model.Group; | ||
| import ru.geekbrains.pocket.messenger.database.entity.Message; | ||
| import ru.geekbrains.pocket.messenger.database.entity.User; | ||
| import ru.geekbrains.pocket.messenger.database.entity.UserProfile; | ||
|
|
||
| import java.awt.*; | ||
| import java.io.File; | ||
|
|
@@ -112,7 +116,7 @@ public class ChatViewController implements Initializable { | |
| private JFXListView<?> groupListView; | ||
|
|
||
| @FXML | ||
| private JFXListView<?> groupSearchListView; | ||
| private JFXListView<CFXListElement> groupSearchListView; | ||
|
|
||
| @FXML | ||
| private JFXListView<CFXListElement> listViewAddToGroup; | ||
|
|
@@ -769,6 +773,15 @@ public void handleGroupCreateButton(){ | |
|
|
||
| @FXML | ||
| public void findContact(KeyEvent keyEvent) { | ||
| if (chats.isSelected()) { | ||
| groupSearchListView.getItems().clear(); | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. А не может быть случая |
||
| Group findGroup = clientController.getGroupInfo(tfSearchInput.getText()); | ||
| findGroup.setGroup_name(tfSearchInput.getText()); | ||
| CFXListElement temp = new CFXListElement(); | ||
| temp.setUser(new User (null, new UserProfile(findGroup.getGid(), findGroup.getGroup_name(), null, null))); | ||
| groupSearchListView.getItems().add(temp); | ||
| return; | ||
| } | ||
| if (tfSearchInput.getText().length()>0) { | ||
| searchObsList.clear(); | ||
| contactsViewPane.setVisible(false); | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Это старый метод. Надо реализовать по аналогии со строкой 78.