-
-
Notifications
You must be signed in to change notification settings - Fork 170
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
3268/redesign join address visualization (#3558)
- Join address pie removed - Join address group mechanism added - User can select multiple addresses for each group - User can rename each group to their liking - The groups are stored in preferences so that user doesn't need to add them back every time - Use the join address group mechanism for time series of Join Addresses - Use the join address group mechanism for Player Retention - Small improvement to retention graph: Show multiple labels - Small improvement to site clock: Can now hover to show actual date Affected issues: - Close #3268
- Loading branch information
Showing
57 changed files
with
814 additions
and
357 deletions.
There are no files selected for viewing
This file contains 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 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
67 changes: 67 additions & 0 deletions
67
...n/src/main/java/com/djrapitops/plan/delivery/domain/datatransfer/PlayerJoinAddresses.java
This file contains 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 |
---|---|---|
@@ -0,0 +1,67 @@ | ||
/* | ||
* This file is part of Player Analytics (Plan). | ||
* | ||
* Plan is free software: you can redistribute it and/or modify | ||
* it under the terms of the GNU Lesser General Public License v3 as published by | ||
* the Free Software Foundation, either version 3 of the License, or | ||
* (at your option) any later version. | ||
* | ||
* Plan is distributed in the hope that it will be useful, | ||
* but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
* GNU Lesser General Public License for more details. | ||
* | ||
* You should have received a copy of the GNU Lesser General Public License | ||
* along with Plan. If not, see <https://www.gnu.org/licenses/>. | ||
*/ | ||
package com.djrapitops.plan.delivery.domain.datatransfer; | ||
|
||
import java.util.List; | ||
import java.util.Map; | ||
import java.util.Objects; | ||
import java.util.UUID; | ||
|
||
/** | ||
* Represents data returned by {@link com.djrapitops.plan.delivery.webserver.resolver.json.PlayerJoinAddressJSONResolver}. | ||
* | ||
* @author AuroraLS3 | ||
*/ | ||
public class PlayerJoinAddresses { | ||
|
||
private final List<String> joinAddresses; | ||
private final Map<UUID, String> joinAddressByPlayer; | ||
|
||
public PlayerJoinAddresses(List<String> joinAddresses, Map<UUID, String> joinAddressByPlayer) { | ||
this.joinAddresses = joinAddresses; | ||
this.joinAddressByPlayer = joinAddressByPlayer; | ||
} | ||
|
||
public List<String> getJoinAddresses() { | ||
return joinAddresses; | ||
} | ||
|
||
public Map<UUID, String> getJoinAddressByPlayer() { | ||
return joinAddressByPlayer; | ||
} | ||
|
||
@Override | ||
public boolean equals(Object o) { | ||
if (this == o) return true; | ||
if (o == null || getClass() != o.getClass()) return false; | ||
PlayerJoinAddresses that = (PlayerJoinAddresses) o; | ||
return Objects.equals(getJoinAddresses(), that.getJoinAddresses()) && Objects.equals(getJoinAddressByPlayer(), that.getJoinAddressByPlayer()); | ||
} | ||
|
||
@Override | ||
public int hashCode() { | ||
return Objects.hash(getJoinAddresses(), getJoinAddressByPlayer()); | ||
} | ||
|
||
@Override | ||
public String toString() { | ||
return "PlayerJoinAddresses{" + | ||
"joinAddresses=" + joinAddresses + | ||
", joinAddressByPlayer=" + joinAddressByPlayer + | ||
'}'; | ||
} | ||
} |
This file contains 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 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 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 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
38 changes: 0 additions & 38 deletions
38
.../src/main/java/com/djrapitops/plan/delivery/rendering/json/graphs/pie/JoinAddressPie.java
This file was deleted.
Oops, something went wrong.
This file contains 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 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 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
Oops, something went wrong.