From ef7dc93db0dd732e69f692549dad335351904bbd Mon Sep 17 00:00:00 2001
From: esoe <igor_nikulin@mail.ru>
Date: Sun, 24 Apr 2022 22:54:21 +0300
Subject: [PATCH] curr

---
 drow/model.drawio                             |  10 +++
 src/main/java/ru/egspt/moodle/Base.java       |   4 +-
 src/main/java/ru/egspt/moodle/UsersModel.java |  82 ++++++++++++++++++
 .../java/ru/egspt/moodle/panel/TagPane.java   |   2 +-
 .../ru/egspt/moodle/panel/UserByTagPane.java  |  18 ++--
 target/classes/ru/egspt/moodle/Base.class     | Bin 15118 -> 15163 bytes
 .../classes/ru/egspt/moodle/UsersModel.class  | Bin 0 -> 2565 bytes
 .../ru/egspt/moodle/panel/UserByTagPane.class | Bin 1054 -> 1068 bytes
 8 files changed, 107 insertions(+), 9 deletions(-)
 create mode 100644 drow/model.drawio
 create mode 100644 src/main/java/ru/egspt/moodle/UsersModel.java
 create mode 100644 target/classes/ru/egspt/moodle/UsersModel.class

diff --git a/drow/model.drawio b/drow/model.drawio
new file mode 100644
index 0000000..e59c804
--- /dev/null
+++ b/drow/model.drawio
@@ -0,0 +1,10 @@
+<mxfile host="65bd71144e">
+    <diagram id="ihwz2KHPgUZGItZvBWFA" name="Page-1">
+        <mxGraphModel dx="758" dy="518" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
+            <root>
+                <mxCell id="0"/>
+                <mxCell id="1" parent="0"/>
+            </root>
+        </mxGraphModel>
+    </diagram>
+</mxfile>
\ No newline at end of file
diff --git a/src/main/java/ru/egspt/moodle/Base.java b/src/main/java/ru/egspt/moodle/Base.java
index 1b7b70e..c6d9eec 100644
--- a/src/main/java/ru/egspt/moodle/Base.java
+++ b/src/main/java/ru/egspt/moodle/Base.java
@@ -42,7 +42,9 @@ public class Base {
 
     
     public Base(){
-        
+        users = new ArrayList<>();
+        results = new ArrayList<>();
+        quizes = new ArrayList<>();
     }
     
     /**
diff --git a/src/main/java/ru/egspt/moodle/UsersModel.java b/src/main/java/ru/egspt/moodle/UsersModel.java
new file mode 100644
index 0000000..d9b66a1
--- /dev/null
+++ b/src/main/java/ru/egspt/moodle/UsersModel.java
@@ -0,0 +1,82 @@
+package ru.egspt.moodle;
+
+import javax.swing.table.TableModel;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import javax.swing.event.TableModelListener;
+
+public class UsersModel implements TableModel{
+    private Set<TableModelListener> listeners = new HashSet<TableModelListener>();
+    private List<User> users;
+ 
+        public UsersModel(List<User> users) {
+            this.users = users;
+        }
+ 
+        public void addTableModelListener(TableModelListener listener) {
+            listeners.add(listener);
+        }
+ 
+        
+        public Class<?> getColumnClass(int columnIndex) {
+            switch (columnIndex) {
+                case 0:
+                    return int.class;
+                case 1:
+                    return String.class;
+                case 2:
+                    return String.class;
+                }
+                return String.class;
+        }
+ 
+        public int getColumnCount() {
+            return 3;
+        }
+ 
+        public String getColumnName(int columnIndex) {
+            switch (columnIndex) {
+            case 0:
+                return "id";
+            case 1:
+                return "name";
+            case 2:
+                return "mail";
+            }
+            return "";
+        }
+ 
+        public int getRowCount() {
+            return users.size();
+        }
+ 
+        public Object getValueAt(int rowIndex, int columnIndex) {
+            User user = users.get(rowIndex);
+            switch (columnIndex) {
+            case 0:
+                return user.getId();
+            case 1:
+                return user.getName();
+            case 2:
+                return user.getMail();
+            }
+            return "";
+        }
+ 
+        public boolean isCellEditable(int rowIndex, int columnIndex) {
+            return false;
+        }
+ 
+        public void removeTableModelListener(TableModelListener listener) {
+            listeners.remove(listener);
+        }
+ 
+        public void setValueAt(Object value, int rowIndex, int columnIndex) {
+ 
+        }
+ 
+    
+    
+}
diff --git a/src/main/java/ru/egspt/moodle/panel/TagPane.java b/src/main/java/ru/egspt/moodle/panel/TagPane.java
index 9037e82..e401e05 100644
--- a/src/main/java/ru/egspt/moodle/panel/TagPane.java
+++ b/src/main/java/ru/egspt/moodle/panel/TagPane.java
@@ -29,6 +29,6 @@ public class TagPane extends JPanel{
         TagAddButton.addActionListener(new TagButtonListener(base, tagField.getText()));
         this.add(TagAddButton);
         //this.add(TagDelButton);
-        this.add(usersPane);//данные надо передать тоже!!!!!!!!!!!!!!
+        this.add(usersPane);
     }
 }
diff --git a/src/main/java/ru/egspt/moodle/panel/UserByTagPane.java b/src/main/java/ru/egspt/moodle/panel/UserByTagPane.java
index feabff9..5489962 100644
--- a/src/main/java/ru/egspt/moodle/panel/UserByTagPane.java
+++ b/src/main/java/ru/egspt/moodle/panel/UserByTagPane.java
@@ -4,22 +4,26 @@ import java.awt.BorderLayout;
 
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
+import javax.swing.JTable;
 import javax.swing.JTextArea;
+import javax.swing.table.TableModel;
 
 import ru.egspt.moodle.Base;
+import ru.egspt.moodle.UsersModel;
 
 public class UserByTagPane extends JPanel{
     JTextArea ta;
     JScrollPane sp;
 
+    /**
+    * данные надо в таблицу отображать, а не в текстовой области
+    * [хороший пример модели данных, подходит для работы с jtable и xlsx в перспективе]
+    * https://javaswing.wordpress.com/2010/05/05/jtabletablemodel/
+    */
     UserByTagPane(Base base){
-        String text = "s;dfkjg s;dfhg so soigspoig psoigspfg ps sigh sp oigpssp oigspih soupsht";
-        ta = new JTextArea();
-        ta.setText(text);
-        ta.append(text);
-        ta.append(text);ta.append(text);ta.append(text);ta.append(text);ta.append(text);
-
-        sp = new JScrollPane(ta);
+        TableModel model = new UsersModel(base.getUsers());
+        JTable table = new JTable(model);
+        sp = new JScrollPane(table);
         setLayout(new BorderLayout());
         add(sp, BorderLayout.CENTER);
     }
diff --git a/target/classes/ru/egspt/moodle/Base.class b/target/classes/ru/egspt/moodle/Base.class
index eacd176b4fac10c73bc1fe480438df8e0a52f7d4..84a3313efada625a5ab462d6b3820593c2a617e5 100644
GIT binary patch
delta 6733
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
DhGfz#

delta 6821
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
UD>YCPto~^f_CR=Nq>GyO-)Sb<PXGV_

diff --git a/target/classes/ru/egspt/moodle/UsersModel.class b/target/classes/ru/egspt/moodle/UsersModel.class
new file mode 100644
index 0000000000000000000000000000000000000000..2cf3aef3217fc5e723bb8bf9048d19f4341e0a45
GIT binary patch
literal 2565
zcma)7`%@EF7(I6rSV$Jo@DPDoA4rpc#<o~n13rpaV|l137W-Vt8do<7lWY+CCprCr
zc4{r{Os7BhZ|Zb<zPp=b!8k3jckjLXJ<d7bcQ1ea^V=T)X0dI;P#CK<a!#qf?dQtX
zYSD9Y59&^>zFaLjo{6}^k*D^Ko%8HUDYv@$)Y<Y)bSq5A?ryIB+~vM+Z_@9+jM`73
z*K_N>Q(+*5fh8TG;k#aL&GGa6y5^QDw%@2Z3YQLkozu%^U}wjv_>sU%VbuH;M(Jt@
zPy&oZ5CeWnAKIE*>O@jU>7H{du75>g@UT-pv#v0Gc=xTL#5%q}*%F9h&_X|k6k_Sj
zx``2mqiqdt+4U#XA%S5G_Cn#f1rt3o8@G^zC5pKfXQffzbZS~uh161Y%l6jonkyoQ
zn{oe%Oa2ob$psap79$5;Uu-wshwWmqU9+aN3YmcNf7T$gp2Q@kOq^BdYtth&3-2LK
z@=TyG94Z*;pnT?$LQk_r6sG=P(G~hjj=xa#8s*A@XV=MnC|$?|wbtSFE;%3TusxT(
zlJ7+h@0+;LtcP|gRD7r8)GT~}4_U(d8+R7@{f($5E*>}xYkrNruaMl*fC`nOv#X#A
z6l2Y|x1KHA+hLs|sH=^Nue(CbT4Yx2GEc(rLC`_`d=J>0hFk2xHG-?qvIn1XR<>QQ
z2R9VhH%UgiSAD)9(UbTL1rxU@R=XxrTno2xnT~b$dnQZJW!?4~&UNA$Nf!>t7@YIG
zgj%t%iaUf%`!^tlb|&tz5}i(10(WuW!UIX%#R!FBf)#jZ;R|dim^%Vs^|1yJEn`@b
zytsd9;VXPiW4Z@A4W*;Dp-f`>t%dKJrpuIvJyxqe4+|5Q+d@u5C!B1Vez(5hc-~^s
z_2q~WuZY4v9j!U#>P~QI^zGI>DboE<EV$C@-GLExtw(e{)}i$olov&prY`4N7b$u+
z7-Oy4sBJknU4b#szK+j}El#oEF+N=|_{*Dv^IqQP1`>RDf3((p+#xXxa6hm(f}^x7
z(cj>EIQtr@?C%)fc#UJPFq)lyg|Q#`A%+Q#Da1MUb4)VC0ETb`?{H@%aK;I|%N4_f
zNl$Vv$%CCf&J@9(<|s*T&`Xk9*`F~wy^k{n9!f4l=Mw0^AR`S$a#*b#7Ba}{h|`#%
zZ9wOoj{JiA;++|P$q_iKM~MuK^AVJ%f5Q2_)NJ_2jez0^RRl%}VGJiZo?*f%&e}9H
zEeIKWgiB2IF+I8wpNJU-SD)ZAM<F=Fw~#lwe~?kr>ef4xI$j`+5yn%<V=naE<y*j}
zLjseW%TJTQ3C>TY=J!%p_fpsQQVV-rNAahbD@&R)6#G2sUx?sOxA3PA;Wsq?#TNcq
zq7eKE7HDiAHx&-^n2qpAw0L}urI5!<B9@k!mk8tgST^t{?ygKoS*H2Ok8nE9=M<l*
zbH8BiSFG>x{YZvy4v-t8%%I%;6gf?~E?^!Pag~6tYarPmS&QI2Y+WD%&{Pe2=CFw^
ziX}x$BK|khChnT?I1v}&gt)Kq9ixE}JIr`dCpsB?Z6z{ViHtCj!sE9#dZ|OB7YOEd
wq)MF{{VAS>_zJ`(x~leh2^wo9qJwI|Q}9rxtNdpWMMQF?fy%W};mSbuU-eM+*#H0l

literal 0
HcmV?d00001

diff --git a/target/classes/ru/egspt/moodle/panel/UserByTagPane.class b/target/classes/ru/egspt/moodle/panel/UserByTagPane.class
index 5fce4b498c75e9a2ae8cc5a04ef9ddc87408401c..c9649ce6f4122a80ce25201766556d2fcedb1bf1 100644
GIT binary patch
delta 571
zcmZ{hOKTHR6vuyev`#uqX-uPO(=@fUk7Sy9tMwfp*y2XgZmL3-BOO8{$&{I?)m8B$
z$SegvfVdGf0fT-3@!JS4#WNGSP>=(cd(Zj(&+ER+e8^bee}DM~T;={7>+7*eR#6NN
zwbu#{BHi`<{f?)fgkBKt`1@YRB1hh2N|FB;+HynB<{al0nU)u&8bzT}Z9I2hxcV?^
zcl3iGa9=grVN|!6WZGt&8O2oP1lbcN4OgF<%qnt;^ra4u+P#*3^w@pY@hpnWCBm{|
zVI({Oq9m?UDs8r&WVsN(RwX^pVxqa2G&Cya9z}ZF?;iL)uNMh9j$+xyBxAA~|4_w=
z6(%fkIyP(6;-9LPzoa;`Ew~pXfeo9>T!}Z0_YcRq$#N9sH1~h|QH-TM%J%*ON0Y_B
zjK=X>PK!a^8DI~YY_9b=JD{*Lq}Z$tDD65!=9}vS7Cy5i_m$>=N}sCZd}1lL-ba5F
zxxuEKWf=zwl5m<VGh#)SnPr0#x0#bq2WM1{Yh0Jts#N9%H)Xu6jD1TmLu8BMy~8Q-
J-WAB;-XE5`g8cvh

delta 553
zcma)(Pfrs;7{-5FkX_a#(4_)Jz_p;lT3P&y(vx~ISWgm?9yn~$r7fE7W@iyR@fpaT
zy!ZhO7ZPa`34Q=?d?DjImYWx6CiBd^@AE$M%*=`P)v|y6{_zudLhabTII@^9c%y2~
z-4A;$Ph(pkmeFacL?$m8EO+(FQ=L}ZQ;8>uL=8|S9SOzziE3viuECAH@KbmgsDn<o
z6>M%rhuO<C3T=vvjUs7>YmDgav_ox%vVp0hO!FkUT-VjX$53kDXQ@ckR<<?yro)`(
zj)X}Pb(<y&`4?l(n#Xe(<#v8yEUYa$m{=xvu1o~sK^DA<(`J;`!_V=4X0ybYEhd&7
zR`B!dg=(oPny;g77Nt6|>JYG&zb$+#4`+WZx&JuIH-_p*mkcu`?-=`i9C!Ske@?N{
zXY!1a|D95`$J7<h{x_a8-_Ybfx6Y`D;*u!d?QzeSXvMwX<H4yMS>Pc%;A6{XTzpK(
ywTrmYXPKlziA|<xFin#gx|De&OmE<q$MW~O#XRMiT-l_}I?qMc;Dy8sZ2SR=V|jG|